Merge pull request #228 from HolySephi/master

fixed some rhel/centos 7 config issues, thx to Sephi

lib/configfiles/rhel7.inc.php

@@ -48,7 +48,7 @@ return array(
 							(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : ''
 						),
 						'restart' => array(
-							'/usr/bin/systemctl reload-or-restart httpd.service'
+							'systemctl reload-or-restart httpd.service'
 						)
 					),
 				),
@@ -72,7 +72,7 @@ return array(
 							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
 							'chown root:root /etc/postfix/mysql-*.cf',
-							'chmod 0644 /etc/postfix/mysql-*.cf',
+							'chmod 0600 /etc/postfix/mysql-*.cf',
 						),
 						'files' => array(
 							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
@@ -99,11 +99,12 @@ return array(
 							'systemctl enable dovecot.service',
 						),
 						'commands' => array(
-							'yum install dovecot dovecot-mysql dovecot-pigeonhole',
+							'touch /etc/dovecot/dovecot-sql.conf.ext',
+							'chmod 0600 /etc/dovecot/dovecot-sql.conf.ext',
 						),
 						'files' => array(
 							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot.conf.ext',
+							'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext',
 							'etc_dovecot_conf.d_10-auth.conf' => '/etc/dovecot/conf.d/10-auth.conf',
 							'etc_dovecot_conf.d_10-logging.conf' => '/etc/dovecot/conf.d/10-logging.conf',
 							'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf',

templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf

@@ -1,4 +1,3 @@
 
 # added for Froxlor
-spamassassin	unix	-	n	n	-	-	pipe flags=R user=spamd argv=/usr/bin/spamc -e /usr/sbin/sendmail -oi -f ${sender} ${recipient}
 dovecot			unix	-	n	n	-	-	pipe flags=DRhu user=vmail:mail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}

templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf

@@ -82,7 +82,7 @@ DefaultServer			on
 # The DebugLevel directive configures the debugging level the server will use when logging.
 # The level parameter must be between 0 and 9.
 # This configuration directive will take precedence over any command-line debugging options used.
-DebugLevel			9
+#DebugLevel			9
 
 # Cause every FTP user except adm to be chrooted into their home directory
 DefaultRoot			~ !adm
@@ -347,7 +347,7 @@ ControlsLog			/var/log/proftpd/controls.log
 
   # Umask 022 is a good standard umask to prevent new dirs and files
   # from being group and world writable
-  Umask				022
+  Umask				077
 
   # Allow users to overwrite files and change permissions
   AllowOverwrite		yes