Skip to content

Commit 76f1973

Browse files
committed
Fixed centos installer bugs.
1 parent 79d37fb commit 76f1973

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

install/dist/lib/fedora.lib.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,22 @@ public function install_ispconfig()
680680

681681
wf("$vhost_conf_dir/ispconfig.vhost", $content);
682682

683+
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
684+
//* and create the symlink
685+
if($this->install_ispconfig_interface == true && $this->is_update == false) {
686+
if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
687+
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
688+
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
689+
}
690+
691+
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
692+
exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
693+
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
694+
exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
695+
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
696+
697+
}
698+
683699
//copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
684700
//* and create the symlink
685701
if($this->install_ispconfig_interface == true && $this->is_update == false) {
@@ -698,8 +714,8 @@ public function install_ispconfig()
698714
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
699715
exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
700716

701-
//set the fast cgi starter script to executable
702-
exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
717+
// set the fast cgi starter script to executable
718+
// exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
703719

704720
//* Make the logs readable for the ispconfig user
705721
if(@is_file('/var/log/maillog')) exec('chmod +r /var/log/maillog');

install/lib/install.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ function removeLine($filename,$search_pattern,$strict = 0) {
558558
}
559559

560560
function is_installed($appname) {
561-
exec('which '.escapeshellcmd($appname),$out);
561+
exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
562562
if(isset($out[0]) && stristr($out[0],$appname)) {
563563
return true;
564564
} else {

0 commit comments

Comments
 (0)