diff --git a/lib/configfiles/etch.inc.php b/lib/configfiles/etch.inc.php index c6421e97..ec4e4b27 100644 --- a/lib/configfiles/etch.inc.php +++ b/lib/configfiles/etch.inc.php @@ -29,7 +29,7 @@ return Array( 'commands' => Array( 'mkdir -p ' . $settings['system']['documentroot_prefix'], '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'], 'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'], 'a2dismod userdir', diff --git a/lib/configfiles/freebsd.inc.php b/lib/configfiles/freebsd.inc.php index 7e7e0237..4eaef0bf 100644 --- a/lib/configfiles/freebsd.inc.php +++ b/lib/configfiles/freebsd.inc.php @@ -177,15 +177,15 @@ return Array( 'proftpd' => Array( 'label' => 'ProFTPd', 'files' => Array( - 'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf' + 'etc_proftpd_proftpd.conf' => '/usr/local/etc/proftpd.conf' ), 'commands' => Array( - 'touch /etc/proftpd/proftpd.conf', - 'chown root:0 /etc/proftpd/proftpd.conf', - 'chmod 0600 /etc/proftpd/proftpd.conf' + 'touch /usr/local/etc/proftpd.conf', + 'chown root:0 /usr/local/etc/proftpd.conf', + 'chmod 0600 /usr/local/etc/proftpd.conf' ), 'restart' => Array( - '/etc/init.d/proftpd restart' + '/usr/local/etc/rc.d/proftpd restart' ) ) )