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

some freebsd-config enhancements, fixes #537

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-06 09:37:49 +00:00
parent c53ef5b96e
commit 06983ca382
2 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/configfiles/freebsd.inc.php
View File

@@ -28,10 +28,10 @@ return Array(
'cd /usr/ports/www/apache22', 'cd /usr/ports/www/apache22',
'make config', 'make config',
'make install', 'make install',
'touch ' . $settings['system']['apacheconf_vhost'], $configcommand['vhost'],
'chown root:0 ' . $settings['system']['apacheconf_vhost'], 'chown root:0 ' . $settings['system']['apacheconf_vhost'],
'chmod 0600 ' . $settings['system']['apacheconf_vhost'], 'chmod 0600 ' . $settings['system']['apacheconf_vhost'],
'touch ' . $settings['system']['apacheconf_diroptions'], $configcommand['diroptions'],
'chown root:0 ' . $settings['system']['apacheconf_diroptions'], 'chown root:0 ' . $settings['system']['apacheconf_diroptions'],
'chmod 0600 ' . $settings['system']['apacheconf_diroptions'], 'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
'mkdir -p ' . $settings['system']['documentroot_prefix'], 'mkdir -p ' . $settings['system']['documentroot_prefix'],
@@ -57,6 +57,7 @@ return Array(
'commands_1' => Array( 'commands_1' => Array(
'cd /usr/ports/dns/powerdns', 'cd /usr/ports/dns/powerdns',
'make config', 'make config',
'set MySQL backend',
'make install', 'make install',
'echo "pdns_enable=\"YES\"" >> /etc/rc.conf', 'echo "pdns_enable=\"YES\"" >> /etc/rc.conf',
), ),
@@ -113,6 +114,21 @@ return Array(
'sh /usr/local/etc/rc.d/postfix restart' 'sh /usr/local/etc/rc.d/postfix restart'
) )
), ),
'postgrey' => Array(
'label' => 'Postgrey',
'commands_1' => Array(
'cd /usr/ports/mail/postgrey',
'make install clean'
),
'commands_2' => Array(
'sed -i.bak \'s/# *check_policy_service *inet:127\.0\.0\.1:10023/ check_policy_service inet:127\.0\.0\.1:10023/\' /usr/local/etc/postfix/main.cf',
'echo "postgrey_enable=\"YES\"" >> /etc/rc.conf'
),
'restart' => Array(
'/usr/local/etc/rc.d/postgrey restart',
'/usr/local/etc/rc.d/postfix restart'
)
),
'postfix_mxaccess' => Array( 'postfix_mxaccess' => Array(
'label' => 'Postfix MX-Access (anti spam)', 'label' => 'Postfix MX-Access (anti spam)',
'files' => Array( 'files' => Array(
@@ -178,14 +194,22 @@ return Array(
'daemons' => Array( 'daemons' => Array(
'proftpd' => Array( 'proftpd' => Array(
'label' => 'ProFTPd', 'label' => 'ProFTPd',
'commands_1' => Array(
'cd /usr/ports/ftp/proftpd',
'make config',
'set MySQL auth',
'set Include mod_quota',
'make install clean'
),
'commands_2' => Array(
'touch /usr/local/etc/proftpd.conf',
'chown root:0 /usr/local/etc/proftpd.conf',
'chmod 0600 /usr/local/etc/proftpd.conf',
'echo "proftpd_enable=\"YES\"" >> /etc/rc.conf'
),
'files' => Array( 'files' => Array(
'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf' 'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf'
), ),
'commands' => Array(
'touch /usr/local/etc/proftpd.conf',
'chown root:0 /usr/local/etc/proftpd.conf',
'chmod 0600 /usr/local/etc/proftpd.conf'
),
'restart' => Array( 'restart' => Array(
'/usr/local/etc/rc.d/proftpd restart' '/usr/local/etc/rc.d/proftpd restart'
) )
@@ -195,18 +219,28 @@ return Array(
'etc' => Array( 'etc' => Array(
'label' => $lng['admin']['configfiles']['etc'], 'label' => $lng['admin']['configfiles']['etc'],
'daemons' => Array( 'daemons' => Array(
'cron' => Array(
'label' => 'Crond (cronscript)',
'commands' => Array(
'echo "*/1 * * * * root /usr/local/bin/php -q /var/customers/froxlor/scripts/froxlor_master_cronjob.php" >> /etc/crontab'
),
'restart' => Array(
'/etc/rc.d/cron restart'
)
),
'awstats' => Array( 'awstats' => Array(
'label' => 'Awstats', 'label' => 'Awstats',
'commands' => Array( 'commands' => Array(
'cd /usr/ports/www/awstats/', 'cd /usr/ports/www/awstats/',
'make install clean', 'make install clean',
'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir($settings['system']['awstats_conf']), 'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir($settings['system']['awstats_conf']),
'sed -i.bak \'s/^LogFile/# LogFile/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'), 'sed -i.bak \'s/^LogFile/# LogFile/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^LogType/# LogType/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'), 'sed -i.bak \'s/^LogType/# LogType/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^LogFormat/# LogFormat/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'), 'sed -i.bak \'s/^LogFormat/# LogFormat/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^LogSeparator/# LogSeparator/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'), 'sed -i.bak \'s/^LogSeparator/# LogSeparator/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^SiteDomain/# SiteDomain/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'), 'sed -i.bak \'s/^SiteDomain/# SiteDomain/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf') 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s/^DirIcons=\"\/awstatsicons\"/DirIcons=\"\/awstats-icon\"/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
) )
), ),
'libnss' => Array( 'libnss' => Array(

10
templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf
View File

@@ -17,8 +17,11 @@ smtpd_recipient_restrictions =
reject_unauth_pipelining, reject_unauth_pipelining,
reject_invalid_hostname, reject_invalid_hostname,
reject_rbl_client sbl-xbl.spamhaus.org, reject_rbl_client sbl-xbl.spamhaus.org,
reject_rbl_client ix.dnsbl.manitu.net,
# sqlgrey enable # sqlgrey enable
# check_policy_service inet:127.0.0.1:2501, # check_policy_service inet:127.0.0.1:2501,
# postgrey enable
# check_policy_service inet:127.0.0.1:10023,
smtpd_client_restrictions = smtpd_client_restrictions =
permit_mynetworks, permit_mynetworks,
@@ -35,8 +38,8 @@ smtpd_sasl_path = private/auth
soft_bounce = yes soft_bounce = yes
# Maximum size of Message in bytes (50MB) # Maximum size of Message in bytes (0 = unlimited)
message_size_limit = 52428800 message_size_limit = 0
smtp_use_tls = yes smtp_use_tls = yes
smtpd_use_tls = yes smtpd_use_tls = yes
@@ -45,7 +48,8 @@ smtpd_tls_auth_only = no
smtp_tls_note_starttls_offer = yes smtp_tls_note_starttls_offer = yes
smtpd_tls_key_file = /etc/ssl/<SERVERNAME>.key.unencrypted smtpd_tls_key_file = /etc/ssl/<SERVERNAME>.key.unencrypted
smtpd_tls_cert_file = /etc/ssl/<SERVERNAME>.crt smtpd_tls_cert_file = /etc/ssl/<SERVERNAME>.crt
smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt # Just an example for CACert.org # Just an example for CACert.org
smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt
smtpd_tls_loglevel = 0 smtpd_tls_loglevel = 0
smtpd_tls_received_header = yes smtpd_tls_received_header = yes
smtpd_tls_session_cache_timeout = 3600s smtpd_tls_session_cache_timeout = 3600s