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

Merge pull request #6 from Lednerb/testing-1

Browse Source 
Testing 1
This commit is contained in:
Sascha Brendel
2015-01-12 14:36:14 +01:00
parent 2ae64d0abe e7d07c7924
commit 5eb630d858
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/configfiles/trusty.inc.php
View File

@@ -89,7 +89,7 @@ return array(
'nginx' => array( 'nginx' => array(
'label' => 'Nginx Webserver', 'label' => 'Nginx Webserver',
'commands_1' => array( 'commands_1' => array(
'apt-get install nginx php5-cgi', 'apt-get install nginx php5-cgi php5-cli',
), ),
'files' => array( 'files' => array(
'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf', 'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
@@ -299,18 +299,13 @@ return array(
'dovecot' => array( 'dovecot' => array(
'label' => 'Dovecot', 'label' => 'Dovecot',
'commands_1' => array( 'commands_1' => array(
'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix dovecot-mysql mail-stack-delivery' 'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql mail-stack-delivery'
), ),
'files' => array( 'files' => array(
'etc_dovecot_conf.d_01_mail_stack_delivery.conf' => '/etc/dovecot/conf.d/01-mail-stack-delivery.conf', 'etc_dovecot_conf.d_01_mail_stack_delivery.conf' => '/etc/dovecot/conf.d/01-mail-stack-delivery.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-auth.conf',
'etc_dovecot_conf.d_auth-sql.conf.ext' => '/etc/dovecot/conf.d/auth-sql.conf.ext',
'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext' 'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext'
), ),
'commands_2' => array(
'chmod 0640 /etc/dovecot/dovecot-sql.conf.ext'
),
'restart' => array( 'restart' => array(
'service dovecot restart' 'service dovecot restart'
) )
@@ -369,7 +364,7 @@ return array(
'etc_cron.d_froxlor' => '/etc/cron.d/froxlor' 'etc_cron.d_froxlor' => '/etc/cron.d/froxlor'
), ),
'restart' => array( 'restart' => array(
Settings::Get('system.crondreload') 'service cron reload'
) )
), ),
'awstats' => array( 'awstats' => array(

8
templates/misc/configfiles/ubuntu_trusty/dovecot/etc_dovecot_conf.d_auth-sql.conf.ext
View File

@@ -1,8 +0,0 @@
passdb {
driver = sql
args = /etc/dovecot/dovecot-sql.conf.ext
}
userdb {
driver = sql
args = /etc/dovecot/dovecot-sql.conf.ext
}