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

Merge pull request #289 from SuperTux88/fix-service-name

Browse Source 
fix(config): fix old apache.service usage
This commit is contained in:
N 2020-10-13 08:41:40 +01:00 committed by GitHub
commit b200780d4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/config/logrotate.sls
View File

@ -19,8 +19,8 @@ apache-config-logrotate-file-managed:
create 640 root adm create 640 root adm
sharedscripts sharedscripts
postrotate postrotate
if /etc/init.d/{{ apache.service }} status >/dev/null; then \ if /etc/init.d/{{ apache.service.name }} status >/dev/null; then \
/etc/init.d/{{ apache.service }} reload >/dev/null; \ /etc/init.d/{{ apache.service.name }} reload >/dev/null; \
fi; fi;
endscript endscript
prerotate prerotate

4
apache/files/FreeBSD/mod_cgi.conf.jinja
View File

@ -1,6 +1,6 @@
<IfModule !mpm_prefork_module> <IfModule !mpm_prefork_module>
LoadModule cgid_module libexec/{{ apache.service }}/mod_cgid.so LoadModule cgid_module libexec/{{ apache.service.name }}/mod_cgid.so
</IfModule> </IfModule>
<IfModule mpm_prefork_module> <IfModule mpm_prefork_module>
LoadModule cgi_module libexec/{{ apache.service }}/mod_cgi.so LoadModule cgi_module libexec/{{ apache.service.name }}/mod_cgi.so
</IfModule> </IfModule>

2
apache/files/FreeBSD/mod_perl.conf.jinja
View File

@ -1 +1 @@
LoadModule perl_module libexec/{{ apache.service }}/mod_perl.so LoadModule perl_module libexec/{{ apache.service.name }}/mod_perl.so

2
apache/files/FreeBSD/mod_php5.conf.jinja
View File

@ -1,4 +1,4 @@
LoadModule php5_module /usr/local/libexec/{{ apache.service }}/libphp5.so LoadModule php5_module /usr/local/libexec/{{ apache.service.name }}/libphp5.so
DirectoryIndex index.html index.php DirectoryIndex index.html index.php

2
apache/files/FreeBSD/mod_proxy.conf.jinja
View File

@ -1 +1 @@
LoadModule proxy_module libexec/{{ apache.service }}/mod_proxy.so LoadModule proxy_module libexec/{{ apache.service.name }}/mod_proxy.so

2
apache/files/FreeBSD/mod_proxy_http.conf.jinja
View File

@ -1 +1 @@
LoadModule proxy_http_module libexec/{{ apache.service }}/mod_proxy_http.so LoadModule proxy_http_module libexec/{{ apache.service.name }}/mod_proxy_http.so

2
apache/files/FreeBSD/mod_rewrite.conf.jinja
View File

@ -1 +1 @@
LoadModule rewrite_module libexec/{{ apache.service }}/mod_rewrite.so LoadModule rewrite_module libexec/{{ apache.service.name }}/mod_rewrite.so

2
apache/files/FreeBSD/mod_suexec.conf.jinja
View File

@ -1 +1 @@
LoadModule suexec_module libexec/{{ apache.service }}/mod_suexec.so LoadModule suexec_module libexec/{{ apache.service.name }}/mod_suexec.so