Skip to content

Commit 11ca0c5

Browse files
author
Till Brehm
committed
Merge branch 'opensuse-srv-www' into 'master'
Use /srv/www instead of /var/www for openSUSE This functionality used to be there, but evidently got lost in this commit: ccbf149
2 parents dc5aefb + 8c96376 commit 11ca0c5

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

install/dist/lib/opensuse.lib.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,9 @@ public function install_ispconfig()
11411141

11421142
$tpl->setVar('apache_version',getapacheversion());
11431143

1144-
wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab());
1144+
$content = $tpl->grab();
1145+
$content = str_replace('/var/www/', '/srv/www/', $content);
1146+
wf($vhost_conf_dir.'/ispconfig.vhost', $content);
11451147

11461148
//if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
11471149
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');

0 commit comments

Comments
 (0)