From de061e7e367f18398852021ab2e5553b0d6ee264 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 12:46:33 +0200
Subject: [PATCH 1/7] add missing apacheconf_htpasswddir dir

---
 lib/configfiles/centos8.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index 0d33a5b9..ad4098e0 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -64,6 +64,7 @@
 						</command>
 						<command><![CDATA[chown root:0 {{settings.system.apacheconf_diroptions}}]]></command>
 						<command><![CDATA[chmod 0600 {{settings.system.apacheconf_diroptions}}]]></command>
+            <command><![CDATA[mkdir -p {{settings.system.apacheconf_htpasswddir}}]]></command>
 						<command><![CDATA[mkdir -p {{settings.system.documentroot_prefix}}]]></command>
 						<command><![CDATA[mkdir -p {{settings.system.logfiles_directory}}]]></command>
 						<command><![CDATA[mkdir -p {{settings.system.mod_fcgid_tmpdir}}]]></command>

From 252449188393aa7b38656f08ec575b7650597173 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 12:47:28 +0200
Subject: [PATCH 2/7] centos8 uses 'dandified yum'

---
 lib/configfiles/centos8.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index ad4098e0..ee568f7e 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -98,7 +98,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 			<service type="dns" title="{{lng.admin.configfiles.dns}}">
 				<!--Bind9 -->
 				<daemon name="bind" title="Bind9 nameserver" default="true">
-					<install><![CDATA[yum install bind]]></install>
+					<install><![CDATA[dnf install bind]]></install>
 					<command><![CDATA[ln -sv /etc/named /etc/bind]]></command>
 					<command><![CDATA[echo "include \"/etc/named.conf.local\";" >> /etc/named.conf]]></command>
 					<command><![CDATA[echo "include \"{{settings.system.bindconf_directory}}froxlor_bind.conf\";" >> /etc/named.conf.local]]></command>
@@ -125,7 +125,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</command>
 					</commands>
 					<installs index="1">
-						<install><![CDATA[yum install postfix]]></install>
+						<install><![CDATA[dnf install postfix]]></install>
 					</installs>
 					<commands index="2">
 						<command><![CDATA[mkdir -p /var/spool/postfix/etc/pam.d]]></command>
@@ -327,7 +327,7 @@ dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dove
 				<!-- Dovecot -->
 				<daemon name="dovecot" version="2.2" title="Dovecot"
 					default="true">
-					<install><![CDATA[yum install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
+					<install><![CDATA[dnf install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
 					<file name="/etc/dovecot/dovecot.conf" chown="root:root"
 						chmod="0644" backup="true">
 						<content><![CDATA[
@@ -1872,7 +1872,7 @@ iterate_query = SELECT username AS user FROM mail_users
 				<!-- Proftpd -->
 				<daemon name="proftpd" version="1.3" title="ProFTPd"
 					default="true">
-					<install><![CDATA[yum install proftpd proftpd-mysql]]></install>
+					<install><![CDATA[dnf install proftpd proftpd-mysql]]></install>
 					<file name="/etc/proftpd.conf" chown="root:0"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2349,8 +2349,8 @@ ControlsLog			/var/log/proftpd/controls.log
 				<!-- libnss-mysql -->
 				<daemon name="libnss"
 					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
-					<install><![CDATA[yum --enablerepo=extras install epel-release]]></install>
-					<install><![CDATA[yum install libnss-mysql nscd]]></install>
+					<install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
+					<install><![CDATA[dnf install libnss-mysql nscd]]></install>
 					<file name="/etc/libnss-mysql.cfg" chown="root:root"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2451,7 +2451,7 @@ aliases:	files nisplus
 				</daemon>
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
-					<install><![CDATA[yum install logrotate]]></install>
+					<install><![CDATA[dnf install logrotate]]></install>
 					<file name="/etc/logrotate.d/froxlor" chown="root:root"
 						chmod="0644">
 						<content><![CDATA[

From db60606cfa61d602b38ed02fa4981c68bdc76bd5 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 12:52:31 +0200
Subject: [PATCH 3/7] proftpd requires epel

---
 lib/configfiles/centos8.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index ee568f7e..4d78ca8f 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -1872,6 +1872,7 @@ iterate_query = SELECT username AS user FROM mail_users
 				<!-- Proftpd -->
 				<daemon name="proftpd" version="1.3" title="ProFTPd"
 					default="true">
+          <install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
 					<install><![CDATA[dnf install proftpd proftpd-mysql]]></install>
 					<file name="/etc/proftpd.conf" chown="root:0"
 						chmod="0600" backup="true">

From b672c722b9170e75158521513dbeb47eabcd50b3 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 13:05:52 +0200
Subject: [PATCH 4/7] no user interaction on package installation

---
 lib/configfiles/centos8.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index 4d78ca8f..3b81b3ba 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -98,7 +98,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 			<service type="dns" title="{{lng.admin.configfiles.dns}}">
 				<!--Bind9 -->
 				<daemon name="bind" title="Bind9 nameserver" default="true">
-					<install><![CDATA[dnf install bind]]></install>
+					<install><![CDATA[dnf -y install bind]]></install>
 					<command><![CDATA[ln -sv /etc/named /etc/bind]]></command>
 					<command><![CDATA[echo "include \"/etc/named.conf.local\";" >> /etc/named.conf]]></command>
 					<command><![CDATA[echo "include \"{{settings.system.bindconf_directory}}froxlor_bind.conf\";" >> /etc/named.conf.local]]></command>
@@ -125,7 +125,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</command>
 					</commands>
 					<installs index="1">
-						<install><![CDATA[dnf install postfix]]></install>
+						<install><![CDATA[dnf -y install postfix]]></install>
 					</installs>
 					<commands index="2">
 						<command><![CDATA[mkdir -p /var/spool/postfix/etc/pam.d]]></command>
@@ -327,7 +327,7 @@ dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dove
 				<!-- Dovecot -->
 				<daemon name="dovecot" version="2.2" title="Dovecot"
 					default="true">
-					<install><![CDATA[dnf install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
+					<install><![CDATA[dnf -y install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
 					<file name="/etc/dovecot/dovecot.conf" chown="root:root"
 						chmod="0644" backup="true">
 						<content><![CDATA[
@@ -1872,8 +1872,8 @@ iterate_query = SELECT username AS user FROM mail_users
 				<!-- Proftpd -->
 				<daemon name="proftpd" version="1.3" title="ProFTPd"
 					default="true">
-          <install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
-					<install><![CDATA[dnf install proftpd proftpd-mysql]]></install>
+          <install><![CDATA[dnf -y --enablerepo=extras install epel-release]]></install>
+					<install><![CDATA[dnf -y install proftpd proftpd-mysql]]></install>
 					<file name="/etc/proftpd.conf" chown="root:0"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2350,8 +2350,8 @@ ControlsLog			/var/log/proftpd/controls.log
 				<!-- libnss-mysql -->
 				<daemon name="libnss"
 					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
-					<install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
-					<install><![CDATA[dnf install libnss-mysql nscd]]></install>
+					<install><![CDATA[dnf -y --enablerepo=extras install epel-release]]></install>
+					<install><![CDATA[dnf -y install libnss-mysql nscd]]></install>
 					<file name="/etc/libnss-mysql.cfg" chown="root:root"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2452,7 +2452,7 @@ aliases:	files nisplus
 				</daemon>
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
-					<install><![CDATA[dnf install logrotate]]></install>
+					<install><![CDATA[dnf -y install logrotate]]></install>
 					<file name="/etc/logrotate.d/froxlor" chown="root:root"
 						chmod="0644">
 						<content><![CDATA[

From b350815aa000c16be44886c5b3e0d6805686ad39 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 13:11:58 +0200
Subject: [PATCH 5/7] install awstats and requirements

---
 lib/configfiles/centos8.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index 3b81b3ba..30ce1efb 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -2343,6 +2343,8 @@ ControlsLog			/var/log/proftpd/controls.log
 				<!-- AWstats -->
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
+					<install><![CDATA[dnf config-manager --set-enabled PowerTools]]></install>
+          <install><![CDATA[dnf -y install awstats]]></install>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[rm /etc/cron.d/awstats]]></command>

From 4e9df61fefd0f79de9e31feb6925c640e47752fb Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 13:15:55 +0200
Subject: [PATCH 6/7] awstats cron is moved to cron.hourly

---
 lib/configfiles/centos8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index 30ce1efb..3e0b5c18 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -2347,7 +2347,7 @@ ControlsLog			/var/log/proftpd/controls.log
           <install><![CDATA[dnf -y install awstats]]></install>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
-					<command><![CDATA[rm /etc/cron.d/awstats]]></command>
+					<command><![CDATA[rm /etc/cron.hourly/awstats]]></command>
 				</daemon>
 				<!-- libnss-mysql -->
 				<daemon name="libnss"

From b59aa6f1400609b7eeb01da2e88ccdb1b2900247 Mon Sep 17 00:00:00 2001
From: Ante de Baas <ante@debaas.net>
Date: Sun, 31 May 2020 14:28:37 +0200
Subject: [PATCH 7/7] undo dnf -y

---
 lib/configfiles/centos8.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/configfiles/centos8.xml b/lib/configfiles/centos8.xml
index 3e0b5c18..207f9785 100644
--- a/lib/configfiles/centos8.xml
+++ b/lib/configfiles/centos8.xml
@@ -98,7 +98,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 			<service type="dns" title="{{lng.admin.configfiles.dns}}">
 				<!--Bind9 -->
 				<daemon name="bind" title="Bind9 nameserver" default="true">
-					<install><![CDATA[dnf -y install bind]]></install>
+					<install><![CDATA[dnf install bind]]></install>
 					<command><![CDATA[ln -sv /etc/named /etc/bind]]></command>
 					<command><![CDATA[echo "include \"/etc/named.conf.local\";" >> /etc/named.conf]]></command>
 					<command><![CDATA[echo "include \"{{settings.system.bindconf_directory}}froxlor_bind.conf\";" >> /etc/named.conf.local]]></command>
@@ -125,7 +125,7 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</command>
 					</commands>
 					<installs index="1">
-						<install><![CDATA[dnf -y install postfix]]></install>
+						<install><![CDATA[dnf install postfix]]></install>
 					</installs>
 					<commands index="2">
 						<command><![CDATA[mkdir -p /var/spool/postfix/etc/pam.d]]></command>
@@ -327,7 +327,7 @@ dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dove
 				<!-- Dovecot -->
 				<daemon name="dovecot" version="2.2" title="Dovecot"
 					default="true">
-					<install><![CDATA[dnf -y install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
+					<install><![CDATA[dnf install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
 					<file name="/etc/dovecot/dovecot.conf" chown="root:root"
 						chmod="0644" backup="true">
 						<content><![CDATA[
@@ -1872,8 +1872,8 @@ iterate_query = SELECT username AS user FROM mail_users
 				<!-- Proftpd -->
 				<daemon name="proftpd" version="1.3" title="ProFTPd"
 					default="true">
-          <install><![CDATA[dnf -y --enablerepo=extras install epel-release]]></install>
-					<install><![CDATA[dnf -y install proftpd proftpd-mysql]]></install>
+          <install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
+					<install><![CDATA[dnf install proftpd proftpd-mysql]]></install>
 					<file name="/etc/proftpd.conf" chown="root:0"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2344,7 +2344,7 @@ ControlsLog			/var/log/proftpd/controls.log
 				<daemon name="awstats"
 					title="Awstats (webalizer alternative)">
 					<install><![CDATA[dnf config-manager --set-enabled PowerTools]]></install>
-          <install><![CDATA[dnf -y install awstats]]></install>
+          <install><![CDATA[dnf install awstats]]></install>
 					<command><![CDATA[sed -i.bak 's/^DirData/# DirData/' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[sed -i.bak 's|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|' {{settings.system.awstats_conf}}/awstats.model.conf]]></command>
 					<command><![CDATA[rm /etc/cron.hourly/awstats]]></command>
@@ -2352,8 +2352,8 @@ ControlsLog			/var/log/proftpd/controls.log
 				<!-- libnss-mysql -->
 				<daemon name="libnss"
 					title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
-					<install><![CDATA[dnf -y --enablerepo=extras install epel-release]]></install>
-					<install><![CDATA[dnf -y install libnss-mysql nscd]]></install>
+					<install><![CDATA[dnf --enablerepo=extras install epel-release]]></install>
+					<install><![CDATA[dnf install libnss-mysql nscd]]></install>
 					<file name="/etc/libnss-mysql.cfg" chown="root:root"
 						chmod="0600" backup="true">
 						<content><![CDATA[
@@ -2454,7 +2454,7 @@ aliases:	files nisplus
 				</daemon>
 				<!-- Logrotate -->
 				<daemon name="logrotate" title="Logrotate">
-					<install><![CDATA[dnf -y install logrotate]]></install>
+					<install><![CDATA[dnf install logrotate]]></install>
 					<file name="/etc/logrotate.d/froxlor" chown="root:root"
 						chmod="0644">
 						<content><![CDATA[