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

Merge pull request #228 from HolySephi/master

Browse Source 
fixed some rhel/centos 7 config issues, thx to Sephi
This commit is contained in:
Michael Kaufmann
2015-02-06 10:56:23 +01:00
parent 71bb3ccc40 4256546115
commit bad427bfba
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/configfiles/rhel7.inc.php
View File

@@ -48,7 +48,7 @@ return array(
(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '' (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : ''
), ),
'restart' => array( '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_mailbox_maps.cf',
'touch /etc/postfix/mysql-virtual_sender_permissions.cf', 'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
'chown root:root /etc/postfix/mysql-*.cf', 'chown root:root /etc/postfix/mysql-*.cf',
'chmod 0644 /etc/postfix/mysql-*.cf', 'chmod 0600 /etc/postfix/mysql-*.cf',
), ),
'files' => array( 'files' => array(
'etc_postfix_main.cf' => '/etc/postfix/main.cf', 'etc_postfix_main.cf' => '/etc/postfix/main.cf',
@@ -99,11 +99,12 @@ return array(
'systemctl enable dovecot.service', 'systemctl enable dovecot.service',
), ),
'commands' => array( '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( 'files' => array(
'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf', '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-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-logging.conf' => '/etc/dovecot/conf.d/10-logging.conf',
'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf', 'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf',

1
templates/misc/configfiles/rhel7/postfix/etc_postfix_master.cf
View File

@@ -1,4 +1,3 @@
# added for Froxlor # 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} dovecot unix - n n - - pipe flags=DRhu user=vmail:mail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${recipient}

20
templates/misc/configfiles/rhel7/proftpd/etc_proftpd_proftpd.conf
View File

@@ -82,7 +82,7 @@ DefaultServer on
# The DebugLevel directive configures the debugging level the server will use when logging. # The DebugLevel directive configures the debugging level the server will use when logging.
# The level parameter must be between 0 and 9. # The level parameter must be between 0 and 9.
# This configuration directive will take precedence over any command-line debugging options used. # 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 # Cause every FTP user except adm to be chrooted into their home directory
DefaultRoot ~ !adm 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 # Umask 022 is a good standard umask to prevent new dirs and files
# from being group and world writable # from being group and world writable
Umask 022 Umask 077
# Allow users to overwrite files and change permissions # Allow users to overwrite files and change permissions
AllowOverwrite yes AllowOverwrite yes
@@ -419,26 +419,26 @@ ControlsLog /var/log/proftpd/controls.log
</IfDefine> </IfDefine>
<IfModule mod_sql_mysql.c> <IfModule mod_sql_mysql.c>
SQLLogFile /var/log/proftpd/sql.log SQLLogFile /var/log/proftpd/sql.log
SQLAuthTypes Crypt SQLAuthTypes Crypt
SQLAuthenticate users* groups* SQLAuthenticate users* groups*
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
SQLUserInfo ftp_users username password uid gid homedir shell SQLUserInfo ftp_users username password uid gid homedir shell
SQLGroupInfo ftp_groups groupname gid members SQLGroupInfo ftp_groups groupname gid members
SQLUserWhereClause "login_enabled = 'y'" SQLUserWhereClause "login_enabled = 'y'"
SQLLog PASS login SQLLog PASS login
#SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users #SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
SQLLog RETR download SQLLog RETR download
#SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users #SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
SQLLog STOR upload SQLLog STOR upload
#SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users #SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
#QuotaEngine on #QuotaEngine on
#QuotaShowQuotas on #QuotaShowQuotas on
#QuotaDisplayUnits Mb #QuotaDisplayUnits Mb
#QuotaLock /var/lock/ftpd.quotatab.lock #QuotaLock /var/lock/ftpd.quotatab.lock
#QuotaLimitTable sql:/get-quota-limit #QuotaLimitTable sql:/get-quota-limit
#QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally #QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally
#SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'" #SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'"