From 8c9637651fb0e2bd16a631b841314d1eb4c5ea96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Sch=C3=BCtz?= <schuetzm@gmx.net>
Date: Tue, 11 Mar 2014 13:47:32 +0100
Subject: [PATCH] openSUSE uses /srv/www instead of /var/www
Therefore, replace the directories in the Apache config upon installation.
This functionality used to be there, but evidently got lost in this commit:
ccbf1497dde4aef031a39544235a284641e694de
---
install/dist/lib/opensuse.lib.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 230f4eb1e6..cc4a401b74 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');
--
GitLab