From 8c780fa63f066723d6a6923493d052e8e17963be Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Thu, 20 Dec 2018 12:37:03 +0100 Subject: [PATCH] Use home and conf_dir from map.jinja to reduce duplication of constants --- nginx/common.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/common.sls b/nginx/common.sls index 93d0972..d26ad81 100644 --- a/nginx/common.sls +++ b/nginx/common.sls @@ -1,7 +1,7 @@ {% from "nginx/map.jinja" import nginx as nginx_map with context %} {% set nginx = pillar.get('nginx', {}) -%} -{% set home = nginx.get('home', '/var/www') -%} -{% set conf_dir = nginx.get('conf_dir', '/etc/nginx') -%} +{% set home = nginx.get('home', nginx_map.home) -%} +{% set conf_dir = nginx.get('conf_dir', nginx_map.conf_dir) -%} {% set conf_template = nginx.get('conf_template', 'salt://nginx/templates/config.jinja') -%} {{ home }}: