From 32f05e5a66940ad86ce21831598c478b7099ed3a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Tue, 13 Oct 2020 02:39:45 +0200
Subject: [PATCH] fix(config): fix old apache.service usage

---
 apache/config/logrotate.sls                    | 4 ++--
 apache/files/FreeBSD/mod_cgi.conf.jinja        | 4 ++--
 apache/files/FreeBSD/mod_perl.conf.jinja       | 2 +-
 apache/files/FreeBSD/mod_php5.conf.jinja       | 2 +-
 apache/files/FreeBSD/mod_proxy.conf.jinja      | 2 +-
 apache/files/FreeBSD/mod_proxy_http.conf.jinja | 2 +-
 apache/files/FreeBSD/mod_rewrite.conf.jinja    | 2 +-
 apache/files/FreeBSD/mod_suexec.conf.jinja     | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apache/config/logrotate.sls b/apache/config/logrotate.sls
index 47ab75e..fa1573c 100644
--- a/apache/config/logrotate.sls
+++ b/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
diff --git a/apache/files/FreeBSD/mod_cgi.conf.jinja b/apache/files/FreeBSD/mod_cgi.conf.jinja
index de72bd9..ee3bd0d 100644
--- a/apache/files/FreeBSD/mod_cgi.conf.jinja
+++ b/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>
diff --git a/apache/files/FreeBSD/mod_perl.conf.jinja b/apache/files/FreeBSD/mod_perl.conf.jinja
index b4da00b..a27af68 100644
--- a/apache/files/FreeBSD/mod_perl.conf.jinja
+++ b/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
diff --git a/apache/files/FreeBSD/mod_php5.conf.jinja b/apache/files/FreeBSD/mod_php5.conf.jinja
index 715fd9b..52e8091 100644
--- a/apache/files/FreeBSD/mod_php5.conf.jinja
+++ b/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
 
diff --git a/apache/files/FreeBSD/mod_proxy.conf.jinja b/apache/files/FreeBSD/mod_proxy.conf.jinja
index 6b732d3..0dd2c14 100644
--- a/apache/files/FreeBSD/mod_proxy.conf.jinja
+++ b/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
diff --git a/apache/files/FreeBSD/mod_proxy_http.conf.jinja b/apache/files/FreeBSD/mod_proxy_http.conf.jinja
index f42063d..4b0bcf1 100644
--- a/apache/files/FreeBSD/mod_proxy_http.conf.jinja
+++ b/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
diff --git a/apache/files/FreeBSD/mod_rewrite.conf.jinja b/apache/files/FreeBSD/mod_rewrite.conf.jinja
index 11c0e23..0cb3250 100644
--- a/apache/files/FreeBSD/mod_rewrite.conf.jinja
+++ b/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
diff --git a/apache/files/FreeBSD/mod_suexec.conf.jinja b/apache/files/FreeBSD/mod_suexec.conf.jinja
index b1497de..0024a2b 100644
--- a/apache/files/FreeBSD/mod_suexec.conf.jinja
+++ b/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