From 11ca0c5316e1c84ace4eb8e40c8d2868f508f13a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 11 Mar 2014 09:26:52 -0400
Subject: [PATCH] Merge branch 'opensuse-srv-www' into 'master'
---
install/dist/lib/opensuse.lib.php | 4 +++-
1 files changed, 3 insertions(+), 1 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');
--
Gitblit v1.9.1