undo dnf -y

This commit is contained in:
Ante de Baas
2020-05-31 14:28:37 +02:00
parent 4e9df61fef
commit b59aa6f140

View File

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