Skip to content

Commit e0efb21

Browse files
committed
Fixed bugs in suse installer
1 parent c832647 commit e0efb21

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

install/dist/lib/opensuse.lib.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,19 @@ public function install_ispconfig()
726726
$content = str_replace('{vhost_port_listen}', '', $content);
727727
}
728728

729+
$content = str_replace('/var/www/', '/srv/www/', $content);
730+
729731
wf("$vhost_conf_dir/ispconfig.vhost", $content);
730732

733+
if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
734+
exec('mkdir -p /srv/www/php-fcgi-scripts/ispconfig');
735+
exec('cp tpl/apache_ispconfig_fcgi_starter.master /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
736+
exec('chmod +x /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
737+
exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
738+
exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
739+
740+
}
741+
731742
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
732743
//* and create the symlink
733744
if($this->install_ispconfig_interface == true && $this->is_update == false) {
@@ -736,14 +747,6 @@ public function install_ispconfig()
736747
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
737748
}
738749

739-
exec('mkdir -p /srv/www/php-fcgi-scripts/ispconfig');
740-
exec('cp tpl/apache_ispconfig_fcgi_starter.master /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
741-
exec('chmod +x /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
742-
exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
743-
exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
744-
745-
//replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
746-
747750
}
748751

749752
// Make the Clamav log files readable by ISPConfig

0 commit comments

Comments
 (0)