maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "ease file-permissions, they sometimes cause issues"

Browse Source 
This reverts commit 5ead5e9c90.

part of this commit is reverted as most files shouldn't be world readable
This commit is contained in:
Robert Förster (Dessa)
2015-10-08 00:32:13 +02:00
parent 2b8a9a74be
commit 9d45f4d534
6 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/configfiles/gentoo.xml
View File

@@ -912,7 +912,7 @@ bind-check-interval=180
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -923,7 +923,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -934,7 +934,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -946,7 +946,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -957,7 +957,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -969,7 +969,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1416,7 +1416,7 @@ debugger_command =
</content>
</file>
<include>//service[@type='smtp']/general/files[@index=0]</include>
<file name="/etc/sasl2/smtpd.conf" chown="root:root" chmod="0644">
<file name="/etc/sasl2/smtpd.conf" chown="root:root" chmod="0600">
<content><![CDATA[
pwcheck_method: auxprop
auxprop_plugin: sql
@@ -1444,7 +1444,7 @@ sql_select: SELECT password_enc FROM mail_users WHERE username='%u@%r' OR email=
<command><![CDATA[echo "net-mail/dovecot mysql managesieve sieve" >> /etc/portage/package.use]]></command>
<install><![CDATA[emerge net-mail/dovecot]]></install>
<file name="/etc/dovecot/dovecot.conf" chown="root:root"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
auth_mechanisms = plain login
## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
@@ -1549,7 +1549,7 @@ protocol lda {
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
driver = mysql
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
@@ -1794,7 +1794,7 @@ plugin {
<daemon name="courier" title="Courier">
<install><![CDATA[emerge net-mail/courier-imap]]></install>
<file name="/etc/courier/authlib/authdaemonrc" chown="root:0"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
##VERSION: $Id: authdaemonrc.in,v 1.12 2005/07/05 12:25:08 mrsam Exp $
#
@@ -1893,7 +1893,7 @@ LOGGEROPTS=""
</content>
</file>
<file name="/etc/courier/authlib/authmysqlrc" chown="root:0"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
MYSQL_SERVER <SQL_HOST>
MYSQL_USERNAME <SQL_UNPRIVILEGED_USER>
@@ -1912,7 +1912,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
]]>
</content>
</file>
<file name="/etc/courier-imap/pop3d" chown="root:0" chmod="0644"
<file name="/etc/courier-imap/pop3d" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: pop3d.dist.in,v 1.11 2004/10/30 15:39:38 mrsam Exp $
@@ -2045,7 +2045,7 @@ PRERUN=
]]>
</content>
</file>
<file name="/etc/courier-imap/imapd" chown="root:0" chmod="0644"
<file name="/etc/courier-imap/imapd" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: imapd.dist.in,v 1.32 2004/11/25 04:57:04 mrsam Exp $
@@ -2427,7 +2427,7 @@ PRERUN=
]]>
</content>
</file>
<file name="/etc/courier-imap/pop3d-ssl" chown="root:0" chmod="0644"
<file name="/etc/courier-imap/pop3d-ssl" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: pop3d-ssl.dist.in,v 1.12 2004/10/21 00:45:35 mrsam Exp $
@@ -2619,7 +2619,7 @@ MAILDIRPATH=.maildir
]]>
</content>
</file>
<file name="/etc/courier-imap/imapd-ssl" chown="root:0" chmod="0644"
<file name="/etc/courier-imap/imapd-ssl" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: imapd-ssl.dist.in,v 1.11 2004/10/21 00:45:35 mrsam Exp $
@@ -2838,7 +2838,7 @@ MAILDIRPATH=.maildir
<daemon name="proftpd" title="ProFTPd" default="true">
<command><![CDATA[echo "net-ftp/proftpd mysql" >> /etc/portage/package.use]]></command>
<install><![CDATA[emerge net-ftp/proftpd]]></install>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
# Server settings
@@ -2983,7 +2983,7 @@ MISC_OTHER="-A -x -j -Z"
]]>
</content>
</file>
<file name="/etc/pureftpd-mysql.conf" chown="root:0" chmod="0644"
<file name="/etc/pureftpd-mysql.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
MYSQLServer <SQL_HOST>
@@ -3082,7 +3082,7 @@ account required pam_mysql.so user=<SQL_UNPRIVILEGED_USER> passwd=<SQL_UN
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -3109,7 +3109,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
<!-- libnss-mysql -->
<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
<install><![CDATA[emerge sys-auth/libnss-mysql]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0644"
<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 \
@@ -3165,7 +3165,7 @@ socket /var/run/mysqld/mysqld.sock
<content><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></content>
</command>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>

24
lib/configfiles/jessie.xml
View File

@@ -918,7 +918,7 @@ bind-check-interval=180
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -929,7 +929,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -940,7 +940,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -952,7 +952,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -963,7 +963,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -975,7 +975,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -2012,7 +2012,7 @@ dict {
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
# This file is commonly accessed via passdb {} or userdb {} section in
# conf.d/auth-sql.conf.ext
@@ -3253,7 +3253,7 @@ plugin {
<!-- Proftpd -->
<daemon name="proftpd" title="ProFTPd" default="true">
<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
#
@@ -3550,7 +3550,7 @@ LoadModule mod_ifsession.c
]]>
</content>
</file>
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
#
@@ -3847,7 +3847,7 @@ UPLOADGID=
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -3880,7 +3880,7 @@ wget http://ftp.us.debian.org/debian/pool/main/libn/libnss-mysql-bg/libnss-mysql
dpkg -i libnss-mysql-bg_1.5-4_`dpkg --print-architecture`.deb
rm libnss-mysql-bg_1.5-4_`dpkg --print-architecture`.deb
]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0644"
<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 \
@@ -3939,7 +3939,7 @@ port 3306
<command><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></command>
</commands>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>

34
lib/configfiles/precise.xml
View File

@@ -380,7 +380,7 @@ local-address=<SERVERIP>,127.0.0.1
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -391,7 +391,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -402,7 +402,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -414,7 +414,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -425,7 +425,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -437,7 +437,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -694,7 +694,7 @@ debugger_command =
</file>
<include>//service[@type='smtp']/general/files[@index=0]</include>
<file name="/etc/postfix/sasl/smtpd.conf" chown="root:root"
chmod="0644">
chmod="0600">
<content><![CDATA[
pwcheck_method: auxprop
auxprop_plugin: sql
@@ -809,7 +809,7 @@ service auth {
</content>
</file>
<file name="/etc/dovecot/conf.d/10-auth.conf" chown="root:root"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
##
## Authentication processes
@@ -955,7 +955,7 @@ userdb {
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:0"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
driver = mysql
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
@@ -971,7 +971,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<!-- Courier -->
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
@@ -1045,7 +1045,7 @@ authdaemonvar=/var/run/courier/authdaemon
]]>
</content>
</file>
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
MYSQL_SERVER <SQL_HOST>
@@ -1074,7 +1074,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
<!-- Proftpd -->
<daemon name="proftpd" title="ProFTPd" default="true">
<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
#
@@ -1274,7 +1274,7 @@ LoadModule mod_ifsession.c
]]>
</content>
</file>
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
<IfModule mod_sql.c>
@@ -1364,7 +1364,7 @@ no
</content>
</file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
MYSQLServer <SQL_HOST>
MYSQLUser <SQL_UNPRIVILEGED_USER>
@@ -1411,7 +1411,7 @@ UPLOADGID=
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -1440,7 +1440,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<!-- libnss-mysql -->
<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
<install><![CDATA[apt-get install libnss-mysql-bg nscd]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0644"
<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 \
@@ -1496,7 +1496,7 @@ socket /var/run/mysqld/mysqld.sock
<content><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></content>
</command>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>

22
lib/configfiles/rhel_centos.xml
View File

@@ -78,7 +78,7 @@
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -89,7 +89,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -100,7 +100,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -112,7 +112,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -123,7 +123,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -135,7 +135,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1658,7 +1658,7 @@ plugin {
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:0"
chmod="0644">
chmod="0640">
<content><![CDATA[
# This file is opened as root, so it should be owned by root and mode 0600.
#
@@ -1813,7 +1813,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>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
# This is the ProFTPD configuration file
@@ -2275,7 +2275,7 @@ ControlsLog /var/log/proftpd/controls.log
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -2302,7 +2302,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
<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="0644"
<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 \
@@ -2360,7 +2360,7 @@ password <SQL_UNPRIVILEGED_PASSWORD>
<command><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></command>
</commands>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>

32
lib/configfiles/trusty.xml
View File

@@ -400,7 +400,7 @@ local-address=<SERVERIP>,127.0.0.1
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -411,7 +411,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -422,7 +422,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -434,7 +434,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -445,7 +445,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -457,7 +457,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -714,7 +714,7 @@ debugger_command =
</file>
<include>//service[@type='smtp']/general/files[@index=0]</include>
<file name="/etc/postfix/sasl/smtpd.conf" chown="root:root"
chmod="0644">
chmod="0600">
<content><![CDATA[
pwcheck_method: auxprop
auxprop_plugin: sql
@@ -949,7 +949,7 @@ auth_mechanisms = plain login
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:0"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
driver = mysql
connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
@@ -965,7 +965,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<!-- Courier -->
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
@@ -1039,7 +1039,7 @@ authdaemonvar=/var/run/courier/authdaemon
]]>
</content>
</file>
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
MYSQL_SERVER <SQL_HOST>
@@ -1068,7 +1068,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
<!-- Proftpd -->
<daemon name="proftpd" title="ProFTPd" default="true">
<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
#
@@ -1268,7 +1268,7 @@ LoadModule mod_ifsession.c
]]>
</content>
</file>
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
<IfModule mod_sql.c>
@@ -1358,7 +1358,7 @@ no
</content>
</file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
MYSQLServer <SQL_HOST>
MYSQLUser <SQL_UNPRIVILEGED_USER>
@@ -1405,7 +1405,7 @@ UPLOADGID=
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -1434,7 +1434,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<!-- libnss-mysql -->
<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
<install><![CDATA[apt-get install libnss-mysql-bg nscd]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0644"
<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 \
@@ -1490,7 +1490,7 @@ socket /var/run/mysqld/mysqld.sock
<content><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></content>
</command>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>

34
lib/configfiles/wheezy.xml
View File

@@ -742,7 +742,7 @@ bind-check-interval=180
</commands>
<files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -753,7 +753,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -764,7 +764,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content>
</file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -776,7 +776,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0644">
chown="root:postfix" chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -787,7 +787,7 @@ 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="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -799,7 +799,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content>
</file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0644">
chmod="0640">
<content><![CDATA[
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -2463,7 +2463,7 @@ virtual_mailbox_limit = 0
</file>
<include>//service[@type='smtp']/general/files[@index=0]</include>
<file name="/etc/postfix/sasl/smtpd.conf" chown="root:root"
chmod="0644">
chmod="0600">
<content><![CDATA[
pwcheck_method: auxprop
auxprop_plugin: sql
@@ -2492,7 +2492,7 @@ sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@
</installs>
<files index="1">
<file name="/etc/dovecot/dovecot.conf" chown="root:root"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
## Dovecot configuration file
@@ -2596,7 +2596,7 @@ dict {
</content>
</file>
<file name="/etc/dovecot/dovecot-sql.conf.ext" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
# This file is opened as root, so it should be owned by root and mode 0600.
#
@@ -3936,7 +3936,7 @@ service dict {
<!-- Courier -->
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: authdaemonrc.in,v 1.13 2005/10/05 00:07:32 mrsam Exp $
@@ -4045,7 +4045,7 @@ LOGGEROPTS=""
]]>
</content>
</file>
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0644"
<file name="/etc/courier/authmysqlrc" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
##VERSION: $Id: authmysqlrc,v 1.20 2007/10/07 02:50:45 mrsam Exp $
@@ -4348,7 +4348,7 @@ MYSQL_AUXOPTIONS_FIELD CONCAT("allowimap=",imap,",allowpop3=",pop3)
<!-- Proftpd -->
<daemon name="proftpd" title="ProFTPd" default="true">
<install><![CDATA[apt-get install proftpd-basic proftpd-mod-mysql]]></install>
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/proftpd.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
#
@@ -4644,7 +4644,7 @@ LoadModule mod_ifsession.c
]]>
</content>
</file>
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0644"
<file name="/etc/proftpd/sql.conf" chown="root:0" chmod="0600"
backup="true">
<content><![CDATA[
<IfModule mod_sql.c>
@@ -4734,7 +4734,7 @@ no
</content>
</file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true">
chmod="0640" backup="true">
<content><![CDATA[
##############################################
# #
@@ -4918,7 +4918,7 @@ UPLOADGID=
<service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob -->
<daemon name="cron" title="Cronjob for froxlor" mandatory="true">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<file name="/etc/cron.d/froxlor" chown="root:0" chmod="0640">
<content><![CDATA[
#
# Set PATH, otherwise restart-scripts won't find start-stop-daemon
@@ -4947,7 +4947,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
<!-- libnss-mysql -->
<daemon name="libnss" title="libnss-mysql (required for FCGID/php-fpm/mpm-itk)">
<install><![CDATA[apt-get install libnss-mysql-bg nscd]]></install>
<file name="/etc/libnss-mysql.cfg" chown="root:root" chmod="0644"
<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 \
@@ -5006,7 +5006,7 @@ port 3306
<command><![CDATA[sed -i.bak 's|^\\(socket\\).*$|\\1\\"{{sql.socket}}\\"|' /etc/libnss-mysql.cfg]]></command>
</commands>
<file name="/etc/libnss-mysql-root.cfg" chown="root:root"
chmod="0644" backup="true">
chmod="0600" backup="true">
<content><![CDATA[
username <SQL_UNPRIVILEGED_USER>
password <SQL_UNPRIVILEGED_PASSWORD>