saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #290 from SuperTux88/fix-modules-enable

Browse Source 
Fix modules enable
This commit is contained in:
N 2020-10-14 11:44:05 +01:00 committed by GitHub
commit 9a385b4fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/config/modules/install.sls
View File

@ -18,7 +18,7 @@ apache-config-modules-{{ module }}-enable:
cmd.run: cmd.run:
- name: a2enmod -f {{ module }} - name: a2enmod -f {{ module }}
- onlyif: ls {{ apache.moddir }}/{{ module }}.load - unless: ls {{ apache.moddir }}/{{ module }}.load
{% elif grains.os_family in ('RedHat', 'Arch') %} {% elif grains.os_family in ('RedHat', 'Arch') %}

2
apache/config/vhosts/proxy.tmpl
View File

@ -16,7 +16,7 @@
'LogLevel': site.get('LogLevel', 'warn'), 'LogLevel': site.get('LogLevel', 'warn'),
'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\""'), 'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\""'),
'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
'ProxyRequests': site.get('ProxyRequests', 'Off'), 'ProxyRequests': site.get('ProxyRequests', 'Off'),

2
apache/config/vhosts/redirect.tmpl
View File

@ -17,7 +17,7 @@
'LogLevel': site.get('LogLevel', 'warn'), 'LogLevel': site.get('LogLevel', 'warn'),
'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)), 'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O"'), 'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b"'),
'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)), 'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
'RedirectSource': site.get('RedirectSource', '/'), 'RedirectSource': site.get('RedirectSource', '/'),

2
apache/osfamilymap.yaml
View File

@ -47,7 +47,7 @@ Debian:
logdir: /var/log/apache2 logdir: /var/log/apache2
logrotatedir: /etc/logrotate.d/apache2 logrotatedir: /etc/logrotate.d/apache2
wwwdir: /srv wwwdir: /srv
moddir: /etc/apache2/mods-available moddir: /etc/apache2/mods-enabled
sitesdir: /etc/apache2/sites-enabled sitesdir: /etc/apache2/sites-enabled
RedHat: RedHat:

2
test/salt/pillar/modules.sls
View File

@ -377,7 +377,6 @@ apache:
modules: modules:
enabled: # List modules to enable enabled: # List modules to enable
- ssl - ssl
- prefork
- rewrite - rewrite
- proxy - proxy
- proxy_ajp - proxy_ajp
@ -385,7 +384,6 @@ apache:
- headers - headers
# geoip # geoip
- status - status
- logio
- dav - dav
- dav_fs - dav_fs
- dav_lock - dav_lock