From b769cc8edfc8503055f3b3b5b86b7076e939ad4e Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 11 Mar 2014 15:01:38 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
server/conf/vhost.conf.master | 4 ++--
server/conf/apache_ispconfig.conf.master | 6 +++---
install/lib/install.lib.php | 1 +
install/dist/lib/opensuse.lib.php | 4 +++-
install/tpl/apache_ispconfig.conf.master | 6 +++---
server/lib/classes/cron.d/500-backup.inc.php | 2 +-
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 230f4eb..cc4a401 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1141,7 +1141,9 @@
$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 5de8777..47c4578 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -812,6 +812,7 @@
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 f9062f5..6873e53 100644
--- a/install/tpl/apache_ispconfig.conf.master
+++ b/install/tpl/apache_ispconfig.conf.master
@@ -9,7 +9,7 @@
<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 @@
<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 @@
<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 f9062f5..6873e53 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/server/conf/apache_ispconfig.conf.master
@@ -9,7 +9,7 @@
<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 @@
<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 @@
<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 2e90dde..62a9199 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 627cdd5..abca144 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 @@
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) {
--
Gitblit v1.9.1