diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 230f4eb1e69913516a1e2f9666e3b499badd300e..cc4a401b74db9e52f3dcc7830513610acaf2a3e1 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -1141,7 +1141,9 @@ class installer_dist extends installer_base { $tpl->setVar('apache_version',getapacheversion()); - wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab()); + $content = $tpl->grab(); + $content = str_replace('/var/www/', '/srv/www/', $content); + wf($vhost_conf_dir.'/ispconfig.vhost', $content); //if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) { $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master'); diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 5de8777ba14fab4ca7165ac026229d49b167e91a..47c4578401d5a4646c324a42a2a1b77b04547ef5 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -812,6 +812,7 @@ function get_system_timezone() { if(!$timezone && is_link('/etc/localtime')) { $timezone = readlink('/etc/localtime'); $timezone = str_replace('/usr/share/zoneinfo/', '', $timezone); + $timezone = str_replace('..', '', $timezone); if(substr($timezone, 0, 6) === 'posix/') $timezone = substr($timezone, 6); } elseif(!$timezone) { $hash = md5_file('/etc/localtime'); diff --git a/install/tpl/apache_ispconfig.conf.master b/install/tpl/apache_ispconfig.conf.master index f9062f549da65c17c5447b36986dd9f6af26913e..6873e539f8a4d0901eb1ddcb7bba8d099b20f05f 100644 --- a/install/tpl/apache_ispconfig.conf.master +++ b/install/tpl/apache_ispconfig.conf.master @@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /var/www/clients> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all @@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all @@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /var/www/conf> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master index f9062f549da65c17c5447b36986dd9f6af26913e..6873e539f8a4d0901eb1ddcb7bba8d099b20f05f 100644 --- a/server/conf/apache_ispconfig.conf.master +++ b/server/conf/apache_ispconfig.conf.master @@ -9,7 +9,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /var/www/clients> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all @@ -20,7 +20,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all @@ -30,7 +30,7 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m <Directory /var/www/conf> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master index 2e90ddeab374b097f4cd1bf21092bb7a3e48b391..62a9199e4f8ba7426830de1004548c3595bf5d21 100644 --- a/server/conf/vhost.conf.master +++ b/server/conf/vhost.conf.master @@ -2,7 +2,7 @@ <Directory {tmpl_var name='web_basedir'}/{tmpl_var name='domain'}> AllowOverride None <tmpl_if name='apache_version' op='>' value='2.2' format='version'> - Require all deny + Require all denied <tmpl_else> Order Deny,Allow Deny from all @@ -351,4 +351,4 @@ <tmpl_var name='apache_directives'> </VirtualHost> -</tmpl_loop> \ No newline at end of file +</tmpl_loop> diff --git a/server/lib/classes/cron.d/500-backup.inc.php b/server/lib/classes/cron.d/500-backup.inc.php index 627cdd58c3f98c973e67b5e82fe98cf7a5fd279c..abca144f4043207bb0fde7dcff5d7188b470f267 100644 --- a/server/lib/classes/cron.d/500-backup.inc.php +++ b/server/lib/classes/cron.d/500-backup.inc.php @@ -85,7 +85,7 @@ class cronjob_backup extends cronjob { if($run_backups){ //* backup only active domains - $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND active = 'y'"; + $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias') AND active = 'y'"; $records = $app->db->queryAllRecords($sql); if(is_array($records)) { foreach($records as $rec) {