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

fix(config): fix old apache.service usage

apache/config/logrotate.sls

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

apache/files/FreeBSD/mod_cgi.conf.jinja

@@ -1,6 +1,6 @@
 <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 mpm_prefork_module>
-	LoadModule cgi_module libexec/{{ apache.service }}/mod_cgi.so
+	LoadModule cgi_module libexec/{{ apache.service.name }}/mod_cgi.so
 </IfModule>

apache/files/FreeBSD/mod_perl.conf.jinja

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

apache/files/FreeBSD/mod_php5.conf.jinja

@@ -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
 

apache/files/FreeBSD/mod_proxy.conf.jinja

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

apache/files/FreeBSD/mod_proxy_http.conf.jinja

@@ -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

apache/files/FreeBSD/mod_rewrite.conf.jinja

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

apache/files/FreeBSD/mod_suexec.conf.jinja

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