Fix metadata name collision
diff --git a/apache/map.jinja b/apache/map.jinja
index 08be690..a1dddb3 100644
--- a/apache/map.jinja
+++ b/apache/map.jinja
@@ -14,8 +14,8 @@
'conf_ext': '.conf',
'log_dir': '/var/log/apache2',
'wwwdir': '/srv',
- 'user': 'www-data',
- 'group': 'www-data',
+ 'service_user': 'www-data',
+ 'service_group': 'www-data',
},
'Arch': {
'pkgs': ['apache'],
@@ -28,8 +28,8 @@
'conf_ext': '.conf',
'log_dir': '/var/log/httpd',
'wwwdir': '/srv',
- 'user': 'apache',
- 'group': 'apache',
+ 'service_user': 'apache',
+ 'service_group': 'apache',
},
'RedHat': {
'pkgs': ['httpd'],
@@ -41,8 +41,8 @@
'conf_ext': '.conf',
'log_dir': '/var/log/httpd',
'www_dir': '/var/www',
- 'user': 'apache',
- 'group': 'apache',
+ 'service_user': 'apache',
+ 'service_group': 'apache',
},
'FreeBSD': {
'pkgs': ['apache22'],
@@ -54,8 +54,8 @@
'conf_ext': '',
'log_dir': '/var/log/',
'www_dir': '/usr/local/www/apache22/',
- 'user': 'apache',
- 'group': 'apache',
+ 'service_user': 'apache',
+ 'service_group': 'apache',
},
}, merge=salt['pillar.get']('apache:server')) %}
diff --git a/apache/server/site.sls b/apache/server/site.sls
index 05cc5a1..84f4d5d 100644
--- a/apache/server/site.sls
+++ b/apache/server/site.sls
@@ -25,8 +25,8 @@
{{ site.name }}_webdav_dir:
file.directory:
- name: {{ site.root }}
- - user: {{ server.user }}
- - group: {{ server.group }}
+ - user: {{ server.service_user }}
+ - group: {{ server.service_group }}
- makedirs: true
{%- endif %}
@@ -35,8 +35,8 @@
{{ site.name }}_webdav_{{ location.uri }}_dir:
file.directory:
- name: {{ location.path }}
- - user: {{ server.user }}
- - group: {{ server.group }}
+ - user: {{ server.service_user }}
+ - group: {{ server.service_group }}
- makedirs: true
{%- endif %}
{%- endfor %}