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

Merge pull request #250 from blueJack92/patch-3

Browse Source 
Fixing (possible) permission problems of configuration files
This commit is contained in:
Michael Kaufmann
2015-09-10 08:19:41 +02:00
parent bdb2115c16 7c45ca220b
commit 2c38bca1b5
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/configfiles/jessie.xml
View File

@@ -342,7 +342,7 @@ exit "$RETVAL"
<install><![CDATA[apt-get install bind9]]></install> <install><![CDATA[apt-get install bind9]]></install>
<command><![CDATA[echo "include \"{{settings.system.bindconf_directory}}froxlor_bind.conf\";" >> /etc/bind/named.conf.local]]></command> <command><![CDATA[echo "include \"{{settings.system.bindconf_directory}}froxlor_bind.conf\";" >> /etc/bind/named.conf.local]]></command>
<command><![CDATA[touch {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command> <command><![CDATA[touch {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command>
<command><![CDATA[chown bind:0 {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command> <command><![CDATA[chown 0:bind {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command>
<command><![CDATA[chmod 0644 {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command> <command><![CDATA[chmod 0644 {{settings.system.bindconf_directory}}froxlor_bind.conf]]></command>
<command><![CDATA[/etc/init.d/bind9 restart]]></command> <command><![CDATA[/etc/init.d/bind9 restart]]></command>
</daemon> </daemon>
@@ -914,11 +914,11 @@ bind-check-interval=180
<command><![CDATA[mkdir -p /var/spool/postfix/var/run/mysqld]]></command> <command><![CDATA[mkdir -p /var/spool/postfix/var/run/mysqld]]></command>
<command><![CDATA[mkdir -p {{settings.system.vmail_homedir}}]]></command> <command><![CDATA[mkdir -p {{settings.system.vmail_homedir}}]]></command>
<command><![CDATA[chown -R {{settings.system.vmail_uid}}:{{settings.system.vmail_gid}} {{settings.system.vmail_homedir}}]]></command> <command><![CDATA[chown -R {{settings.system.vmail_uid}}:{{settings.system.vmail_gid}} {{settings.system.vmail_homedir}}]]></command>
<command><![CDATA[chmod 0750 {{settings.system.vmail_homedir}}]]></command> <command><![CDATA[chmod 0755 {{settings.system.vmail_homedir}}]]></command>
</commands> </commands>
<files index="0"> <files index="0">
<file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix" <file name="/etc/postfix/mysql-virtual_alias_maps.cf" chown="root:postfix"
chmod="0640"> chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -929,7 +929,7 @@ query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destina
</content> </content>
</file> </file>
<file name="/etc/postfix/mysql-virtual_mailbox_domains.cf" <file name="/etc/postfix/mysql-virtual_mailbox_domains.cf"
chown="root:postfix" chmod="0640"> chown="root:postfix" chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -940,7 +940,7 @@ query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain =
</content> </content>
</file> </file>
<file name="/etc/postfix/mysql-virtual_mailbox_maps.cf" <file name="/etc/postfix/mysql-virtual_mailbox_maps.cf"
chown="root:postfix" chmod="0640"> chown="root:postfix" chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -952,7 +952,7 @@ query = SELECT CONCAT(homedir,maildir) FROM mail_users WHERE email = '%s'
</content> </content>
</file> </file>
<file name="/etc/postfix/mysql-virtual_sender_permissions.cf" <file name="/etc/postfix/mysql-virtual_sender_permissions.cf"
chown="root:postfix" chmod="0640"> chown="root:postfix" chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -963,7 +963,7 @@ query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_vi
</content> </content>
</file> </file>
<file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix" <file name="/etc/postfix/mysql-virtual_uid_maps.cf" chown="root:postfix"
chmod="0640"> chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -975,7 +975,7 @@ query = SELECT uid FROM mail_users WHERE email = '%s'
</content> </content>
</file> </file>
<file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix" <file name="/etc/postfix/mysql-virtual_gid_maps.cf" chown="root:postfix"
chmod="0640"> chmod="0644">
<content><![CDATA[ <content><![CDATA[
user = <SQL_UNPRIVILEGED_USER> user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD> password = <SQL_UNPRIVILEGED_PASSWORD>
@@ -1655,40 +1655,40 @@ debugger_command =
# sendmail_path: The full pathname of the Postfix sendmail command. # sendmail_path: The full pathname of the Postfix sendmail command.
# This is the Sendmail-compatible mail posting interface. # This is the Sendmail-compatible mail posting interface.
# #
sendmail_path = sendmail_path = /usr/sbin/sendmail
# newaliases_path: The full pathname of the Postfix newaliases command. # newaliases_path: The full pathname of the Postfix newaliases command.
# This is the Sendmail-compatible command to build alias databases. # This is the Sendmail-compatible command to build alias databases.
# #
newaliases_path = newaliases_path = /usr/bin/newaliases
# mailq_path: The full pathname of the Postfix mailq command. This # mailq_path: The full pathname of the Postfix mailq command. This
# is the Sendmail-compatible mail queue listing command. # is the Sendmail-compatible mail queue listing command.
# #
mailq_path = mailq_path = /usr/bin/mailq
# setgid_group: The group for mail submission and queue management # setgid_group: The group for mail submission and queue management
# commands. This must be a group name with a numerical group ID that # commands. This must be a group name with a numerical group ID that
# is not shared with other accounts, not even with the Postfix account. # is not shared with other accounts, not even with the Postfix account.
# #
setgid_group = setgid_group = postdrop
# html_directory: The location of the Postfix HTML documentation. # html_directory: The location of the Postfix HTML documentation.
# #
html_directory = html_directory = no
# manpage_directory: The location of the Postfix on-line manual pages. # manpage_directory: The location of the Postfix on-line manual pages.
# #
manpage_directory = manpage_directory = /usr/share/man
# sample_directory: The location of the Postfix sample configuration files. # sample_directory: The location of the Postfix sample configuration files.
# This parameter is obsolete as of Postfix 2.1. # This parameter is obsolete as of Postfix 2.1.
# #
sample_directory = sample_directory = /usr/share/doc/postfix
# readme_directory: The location of the Postfix README files. # readme_directory: The location of the Postfix README files.
# #
readme_directory = readme_directory = /usr/share/doc/postfix
inet_protocols = ipv4 inet_protocols = ipv4
append_dot_mydomain = no append_dot_mydomain = no
@@ -1904,7 +1904,7 @@ dovecot unix - n n - - pipe
</installs> </installs>
<files index="1"> <files index="1">
<file name="/etc/dovecot/dovecot.conf" chown="root:root" <file name="/etc/dovecot/dovecot.conf" chown="root:root"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## Dovecot configuration file ## Dovecot configuration file
@@ -2161,7 +2161,7 @@ password_query = SELECT username AS user, password_enc AS password, CONCAT(homed
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/10-auth.conf" chown="root:0" <file name="/etc/dovecot/conf.d/10-auth.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## Authentication processes ## Authentication processes
@@ -2295,7 +2295,7 @@ auth_mechanisms = plain login
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/10-mail.conf" chown="root:0" <file name="/etc/dovecot/conf.d/10-mail.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## Mailbox locations and namespaces ## Mailbox locations and namespaces
@@ -2672,7 +2672,7 @@ mail_access_groups = vmail
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/10-master.conf" chown="root:0" <file name="/etc/dovecot/conf.d/10-master.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
#default_process_limit = 100 #default_process_limit = 100
#default_client_limit = 1000 #default_client_limit = 1000
@@ -2806,7 +2806,7 @@ service dict {
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/15-lda.conf" chown="root:0" <file name="/etc/dovecot/conf.d/15-lda.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## LDA specific settings (also used by LMTP) ## LDA specific settings (also used by LMTP)
@@ -2860,7 +2860,7 @@ protocol lda {
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/20-imap.conf" chown="root:0" <file name="/etc/dovecot/conf.d/20-imap.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## IMAP specific settings ## IMAP specific settings
@@ -2927,7 +2927,7 @@ protocol imap {
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0" <file name="/etc/dovecot/conf.d/20-managesieve.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## ManageSieve specific settings ## ManageSieve specific settings
@@ -3009,7 +3009,7 @@ protocol sieve {
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/20-pop3.conf" chown="root:0" <file name="/etc/dovecot/conf.d/20-pop3.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## POP3 specific settings ## POP3 specific settings
@@ -3113,7 +3113,7 @@ protocol pop3 {
</content> </content>
</file> </file>
<file name="/etc/dovecot/conf.d/90-sieve.conf" chown="root:0" <file name="/etc/dovecot/conf.d/90-sieve.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
## ##
## Settings for the Sieve interpreter ## Settings for the Sieve interpreter
@@ -3663,7 +3663,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0640" backup="true"> chmod="0644" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #
@@ -3847,7 +3847,7 @@ UPLOADGID=
<service type="system" title="{{lng.admin.configfiles.etc}}"> <service type="system" title="{{lng.admin.configfiles.etc}}">
<!-- Cronjob --> <!-- 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"> <file name="/etc/cron.d/froxlor" chown="root:0" chmod="0644">
<content><![CDATA[ <content><![CDATA[
# #
# Set PATH, otherwise restart-scripts won't find start-stop-daemon # Set PATH, otherwise restart-scripts won't find start-stop-daemon