auto-format all files; add table-definitions to test-bootstrap file
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<froxlor>
|
||||
<distribution name="RHEL / CentOS" version="7" defaulteditor="/usr/bin/nano">
|
||||
<distribution name="RHEL / CentOS" version="7"
|
||||
defaulteditor="/usr/bin/nano">
|
||||
<services>
|
||||
<!-- HTTP -->
|
||||
<service type="http" title="{{lng.admin.configfiles.http}}">
|
||||
@@ -87,8 +88,8 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
|
||||
<command><![CDATA[chmod 0750 {{settings.system.vmail_homedir}}]]></command>
|
||||
</commands>
|
||||
<files index="0">
|
||||
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
|
||||
chmod="0640">
|
||||
<file name="/etc/postfix/mysql-virtual_alias_maps.cf"
|
||||
chown="root:postfix" chmod="0640">
|
||||
<content><![CDATA[
|
||||
user = <SQL_UNPRIVILEGED_USER>
|
||||
password = <SQL_UNPRIVILEGED_PASSWORD>
|
||||
@@ -132,8 +133,8 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
|
||||
]]>
|
||||
</content>
|
||||
</file>
|
||||
<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
|
||||
chmod="0640">
|
||||
<file name="/etc/postfix/mysql-virtual_uid_maps.cf"
|
||||
chown="root:postfix" chmod="0640">
|
||||
<content><![CDATA[
|
||||
user = <SQL_UNPRIVILEGED_USER>
|
||||
password = <SQL_UNPRIVILEGED_PASSWORD>
|
||||
@@ -144,8 +145,8 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
|
||||
]]>
|
||||
</content>
|
||||
</file>
|
||||
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
|
||||
chmod="0640">
|
||||
<file name="/etc/postfix/mysql-virtual_gid_maps.cf"
|
||||
chown="root:postfix" chmod="0640">
|
||||
<content><![CDATA[
|
||||
user = <SQL_UNPRIVILEGED_USER>
|
||||
password = <SQL_UNPRIVILEGED_PASSWORD>
|
||||
@@ -164,16 +165,16 @@ query = SELECT gid FROM mail_users WHERE email = '%s'
|
||||
</commands>
|
||||
</general>
|
||||
<!-- postfix with dovecot -->
|
||||
<daemon name="postfix_dovecot" version="2.10" title="Postfix with dovecot"
|
||||
default="true">
|
||||
<daemon name="postfix_dovecot" version="2.10"
|
||||
title="Postfix with dovecot" default="true">
|
||||
<include>//service[@type='smtp']/general/commands[@index=1]
|
||||
</include>
|
||||
<include>//service[@type='smtp']/general/installs[@index=1]
|
||||
</include>
|
||||
<include>//service[@type='smtp']/general/commands[@index=2]
|
||||
</include>
|
||||
<file name="/etc/postfix/main.cf" chown="root:root" chmod="0644"
|
||||
backup="true">
|
||||
<file name="/etc/postfix/main.cf" chown="root:root"
|
||||
chmod="0644" backup="true">
|
||||
<content><![CDATA[
|
||||
## General Postfix configuration
|
||||
# FQDN from Froxlor
|
||||
@@ -262,8 +263,8 @@ debugger_command =
|
||||
</content>
|
||||
</file>
|
||||
<include>//service[@type='smtp']/general/files[@index=0]</include>
|
||||
<file name="/etc/postfix/master.cf" chown="root:root" chmod="0644"
|
||||
backup="true" mode="append">
|
||||
<file name="/etc/postfix/master.cf" chown="root:root"
|
||||
chmod="0644" backup="true" mode="append">
|
||||
<content><![CDATA[
|
||||
# added for Froxlor
|
||||
dovecot unix - n n - - pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}
|
||||
@@ -277,7 +278,8 @@ dovecot unix - n n - - pipe flags=DRhu user=vmail:vmail argv=/usr/libexec/dove
|
||||
<!-- IMAP/POP3 services -->
|
||||
<service type="mail" title="{{lng.admin.configfiles.mail}}">
|
||||
<!-- Dovecot -->
|
||||
<daemon name="dovecot" version="2.2" title="Dovecot" default="true">
|
||||
<daemon name="dovecot" version="2.2" title="Dovecot"
|
||||
default="true">
|
||||
<install><![CDATA[yum install dovecot dovecot-mysql dovecot-pigeonhole]]></install>
|
||||
<file name="/etc/dovecot/dovecot.conf" chown="root:root"
|
||||
chmod="0644" backup="true">
|
||||
@@ -504,8 +506,8 @@ auth_mechanisms = plain
|
||||
]]>
|
||||
</content>
|
||||
</file>
|
||||
<file name="/etc/dovecot/conf.d/10-logging.conf" chown="root:0"
|
||||
chmod="0644" backup="true">
|
||||
<file name="/etc/dovecot/conf.d/10-logging.conf"
|
||||
chown="root:0" chmod="0644" backup="true">
|
||||
<content><![CDATA[
|
||||
##
|
||||
## Log destination.
|
||||
@@ -1215,8 +1217,8 @@ protocol lda {
|
||||
]]>
|
||||
</content>
|
||||
</file>
|
||||
<file name="/etc/dovecot/conf.d/15-mailboxes.conf" chown="root:0"
|
||||
chmod="0644" backup="true">
|
||||
<file name="/etc/dovecot/conf.d/15-mailboxes.conf"
|
||||
chown="root:0" chmod="0644" backup="true">
|
||||
<content><![CDATA[
|
||||
##
|
||||
## Mailbox definitions
|
||||
@@ -1364,8 +1366,8 @@ protocol lmtp {
|
||||
]]>
|
||||
</content>
|
||||
</file>
|
||||
<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
|
||||
chmod="0644" backup="true">
|
||||
<file name="/etc/dovecot/conf.d/20-managesieve.conf"
|
||||
chown="root:0" chmod="0644" backup="true">
|
||||
<content><![CDATA[
|
||||
##
|
||||
## ManageSieve specific settings
|
||||
@@ -1821,10 +1823,11 @@ iterate_query = SELECT username AS user FROM mail_users
|
||||
<!-- FTP services -->
|
||||
<service type="ftp" title="{{lng.admin.configfiles.ftp}}">
|
||||
<!-- Proftpd -->
|
||||
<daemon name="proftpd" version="1.3" title="ProFTPd" default="true">
|
||||
<daemon name="proftpd" version="1.3" title="ProFTPd"
|
||||
default="true">
|
||||
<install><![CDATA[yum install proftpd proftpd-mysql]]></install>
|
||||
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
|
||||
backup="true">
|
||||
<file name="/etc/proftpd/proftpd.conf" chown="root:0"
|
||||
chmod="0600" backup="true">
|
||||
<content><![CDATA[
|
||||
# This is the ProFTPD configuration file
|
||||
#
|
||||
@@ -2284,7 +2287,8 @@ ControlsLog /var/log/proftpd/controls.log
|
||||
<!-- System tools/services -->
|
||||
<service type="system" title="{{lng.admin.configfiles.etc}}">
|
||||
<!-- Cronjob -->
|
||||
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
|
||||
<daemon name="cron" title="Cronjob for froxlor"
|
||||
mandatory="true">
|
||||
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
|
||||
<content><![CDATA[
|
||||
#
|
||||
@@ -2303,17 +2307,19 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
<command><![CDATA[{{settings.system.crondreload}}]]></command>
|
||||
</daemon>
|
||||
<!-- AWstats -->
|
||||
<daemon name="awstats" title="Awstats (webalizer alternative)">
|
||||
<daemon name="awstats"
|
||||
title="Awstats (webalizer alternative)">
|
||||
<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>
|
||||
</daemon>
|
||||
<!-- libnss-mysql -->
|
||||
<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
|
||||
<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>
|
||||
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0600"
|
||||
backup="true">
|
||||
<file name="/etc/libnss-mysql.cfg" chown="root:root"
|
||||
chmod="0600" backup="true">
|
||||
<content><![CDATA[
|
||||
getpwnam SELECT username,'x',uid,gid,'Froxlor Customer',homedir,shell \
|
||||
FROM ftp_users \
|
||||
@@ -2413,7 +2419,8 @@ aliases: files nisplus
|
||||
<!-- Logrotate -->
|
||||
<daemon name="logrotate" title="Logrotate">
|
||||
<install><![CDATA[yum install logrotate]]></install>
|
||||
<file name="/etc/logrotate.d/froxlor" chown="root:root" chmod="0644">
|
||||
<file name="/etc/logrotate.d/froxlor" chown="root:root"
|
||||
chmod="0644">
|
||||
<content><![CDATA[
|
||||
#
|
||||
# Froxlor logrotate snipet
|
||||
|
||||
Reference in New Issue
Block a user