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

- correct freebsd proftpd template, fixes #132

Browse Source 
- don't display mkdir statement for deactivated docroot when it is not defined, this was already done in the other templates but got somehow lost for etch
This commit is contained in:
Robert Foerster (Dessa)
2010-04-10 00:44:09 +00:00
parent 7c12ab82c5
commit 96d26d0d94
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configfiles/etch.inc.php
View File

@@ -29,7 +29,7 @@ return Array(
'commands' => Array( 'commands' => Array(
'mkdir -p ' . $settings['system']['documentroot_prefix'], 'mkdir -p ' . $settings['system']['documentroot_prefix'],
'mkdir -p ' . $settings['system']['logfiles_directory'], 'mkdir -p ' . $settings['system']['logfiles_directory'],
'mkdir -p ' . $settings['system']['deactivateddocroot'], ($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'], 'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'], 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
'a2dismod userdir', 'a2dismod userdir',

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

@@ -177,15 +177,15 @@ return Array(
'proftpd' => Array( 'proftpd' => Array(
'label' => 'ProFTPd', 'label' => 'ProFTPd',
'files' => Array( 'files' => Array(
'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' 'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf'
), ),
'commands' => Array( 'commands' => Array(
'touch /etc/proftpd/proftpd.conf', 'touch /usr/local/etc/proftpd.conf',
'chown root:0 /etc/proftpd/proftpd.conf', 'chown root:0 /usr/local/etc/proftpd.conf',
'chmod 0600 /etc/proftpd/proftpd.conf' 'chmod 0600 /usr/local/etc/proftpd.conf'
), ),
'restart' => Array( 'restart' => Array(
'/etc/init.d/proftpd restart' '/usr/local/etc/rc.d/proftpd restart'
) )
) )
) )