From 1adb095918a52ad702f24c6e08b12b6bfb3085d2 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Sun, 24 Apr 2022 13:20:34 +0200
Subject: [PATCH] corrections in config-templates

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 lib/configfiles/bionic.xml   | 13 ++++---------
 lib/configfiles/bullseye.xml | 11 +++--------
 lib/configfiles/buster.xml   | 11 +++--------
 lib/configfiles/centos7.xml  |  2 +-
 lib/configfiles/centos8.xml  |  2 +-
 lib/configfiles/focal.xml    | 10 +++-------
 lib/configfiles/gentoo.xml   |  8 ++++----
 7 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml
index e94e41c1..1e1b235a 100644
--- a/lib/configfiles/bionic.xml
+++ b/lib/configfiles/bionic.xml
@@ -86,7 +86,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
@@ -150,7 +150,7 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					</command>
 					<command><![CDATA[lighty-disable-mod cgi]]></command>
 					<command><![CDATA[lighty-disable-mod fastcgi]]></command>
-					<command><![CDATA[/etc/init.d/lighttpd restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Nginx -->
 				<daemon name="nginx" title="nginx">
@@ -366,7 +366,7 @@ exit "$RETVAL"
 						</visibility>
 						<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
 					</command>
-					<command><![CDATA[/etc/init.d/nginx restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
@@ -4661,12 +4661,7 @@ aliases:     files
 						</visibility>
 						<visibility mode="true">{{settings.phpfpm.enabled_ownvhost}}
 						</visibility>
-						<command><![CDATA[a2dismod php7.0]]></command>
-					</commands>
-					<commands index="5">
-						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
-						</visibility>
-						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
+						<command><![CDATA[a2dismod php7.2]]></command>
 					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
diff --git a/lib/configfiles/bullseye.xml b/lib/configfiles/bullseye.xml
index dcded43b..6e99236a 100644
--- a/lib/configfiles/bullseye.xml
+++ b/lib/configfiles/bullseye.xml
@@ -75,7 +75,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[service apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
@@ -139,7 +139,7 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					</command>
 					<command><![CDATA[lighty-disable-mod cgi]]></command>
 					<command><![CDATA[lighty-disable-mod fastcgi]]></command>
-					<command><![CDATA[service lighttpd restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Nginx -->
 				<daemon name="nginx" title="nginx">
@@ -355,7 +355,7 @@ exit "$RETVAL"
 						</visibility>
 						<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
 					</command>
-					<command><![CDATA[service nginx restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
@@ -4874,11 +4874,6 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[a2dismod php7.4]]></command>
 					</commands>
-					<commands index="5">
-						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
-						</visibility>
-						<command><![CDATA[service apache2 restart]]></command>
-					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.install_dir}}scripts/froxlor_master_cronjob.php --force]]></command>
diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml
index 501f9fb3..6deb8b71 100644
--- a/lib/configfiles/buster.xml
+++ b/lib/configfiles/buster.xml
@@ -75,7 +75,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
@@ -139,7 +139,7 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					</command>
 					<command><![CDATA[lighty-disable-mod cgi]]></command>
 					<command><![CDATA[lighty-disable-mod fastcgi]]></command>
-					<command><![CDATA[/etc/init.d/lighttpd restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Nginx -->
 				<daemon name="nginx" title="nginx">
@@ -355,7 +355,7 @@ exit "$RETVAL"
 						</visibility>
 						<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
 					</command>
-					<command><![CDATA[/etc/init.d/nginx restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
@@ -4865,11 +4865,6 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[a2dismod php7.3]]></command>
 					</commands>
-					<commands index="5">
-						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
-						</visibility>
-						<command><![CDATA[/etc/init.d/apache2 restart]]></command>
-					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.install_dir}}scripts/froxlor_master_cronjob.php --force]]></command>
diff --git a/lib/configfiles/centos7.xml b/lib/configfiles/centos7.xml
index c8f2df9b..08b7fe6c 100644
--- a/lib/configfiles/centos7.xml
+++ b/lib/configfiles/centos7.xml
@@ -68,7 +68,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[systemctl reload-or-restart httpd.service]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index c54ba019..f6548ad4 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -69,7 +69,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[systemctl reload-or-restart httpd.service]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
diff --git a/lib/configfiles/focal.xml b/lib/configfiles/focal.xml
index d3e1632b..15d7f73e 100644
--- a/lib/configfiles/focal.xml
+++ b/lib/configfiles/focal.xml
@@ -74,7 +74,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 ]]>
 						</content>
 					</file>
-					<command><![CDATA[service apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
@@ -138,7 +138,7 @@ include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 					</command>
 					<command><![CDATA[lighty-disable-mod cgi]]></command>
 					<command><![CDATA[lighty-disable-mod fastcgi]]></command>
-					<command><![CDATA[service lighttpd restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Nginx -->
 				<daemon name="nginx" title="nginx">
@@ -354,6 +354,7 @@ exit "$RETVAL"
 						</visibility>
 						<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
 					</command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->
@@ -4087,11 +4088,6 @@ aliases:     files
 						</visibility>
 						<command><![CDATA[a2dismod php7.4]]></command>
 					</commands>
-					<commands index="5">
-						<visibility mode="equals" value="apache2">{{settings.system.webserver}}
-						</visibility>
-						<command><![CDATA[service apache2 restart]]></command>
-					</commands>
 					<!-- instead of just restarting apache, we let the cronjob do all the 
 						dirty work -->
 					<command><![CDATA[php {{const.install_dir}}scripts/froxlor_master_cronjob.php --force]]></command>
diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index a830b1bc..0fa11183 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -82,7 +82,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</content>
 					</file>
 					<command><![CDATA[rc-update add apache2 default]]></command>
-					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<daemon name="apache" version="2.4" title="Apache 2.4">
 					<include>//service[@type='http']/general/commands</include>
@@ -113,7 +113,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</content>
 					</file>
 					<command><![CDATA[rc-update add apache2 default]]></command>
-					<command><![CDATA[/etc/init.d/apache2 restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Lighttpd -->
 				<daemon name="lighttpd" title="LigHTTPd">
@@ -205,7 +205,7 @@ alias.url           += ("/.well-known/acme-challenge/" => "{{settings.system.let
 						<content><![CDATA[echo -e '\\ninclude "{{settings.system.apacheconf_diroptions}}"' >> /etc/lighttpd/lighttpd.conf]]></content>
 					</command>
 					<command><![CDATA[rc-update add lighttpd default]]></command>
-					<command><![CDATA[/etc/init.d/lighttpd restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 				<!-- HTTP Nginx -->
 				<daemon name="nginx" title="nginx">
@@ -352,7 +352,7 @@ exit "$RETVAL"
 						<content><![CDATA[/etc/init.d/php-fcgi restart]]></content>
 					</command>
 					<command><![CDATA[rc-update add nginx default]]></command>
-					<command><![CDATA[/etc/init.d/nginx restart]]></command>
+					<command><![CDATA[{{settings.system.apachereload_command}}]]></command>
 				</daemon>
 			</service>
 			<!--DNS -->