tbrehm
2013-02-26 27403ee79e0882a42ffb425a332229cba940a836
Fixed: FS#2716 - Blank page after update on OpenSuSE Linux
4 files modified
18 ■■■■ changed files
install/dist/lib/fedora.lib.php 4 ●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php 6 ●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 4 ●●●● patch | view | raw | blame | history
install/lib/installer_base.lib.php 4 ●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php
@@ -1039,7 +1039,7 @@
            
                replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
                */
                if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                    $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                    $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                    $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1048,7 +1048,7 @@
                    exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                    exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
                    exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
                }
                //}
            }
        }
        
install/dist/lib/gentoo.lib.php
@@ -610,8 +610,8 @@
        
            $this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
        
            if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
            {
            //if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
            //{
                $content = rf('tpl/apache_apps_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -621,7 +621,7 @@
                exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
                exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
            
            }
            //}
        }
        if($conf['nginx']['installed'] == true){
            $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
install/dist/lib/opensuse.lib.php
@@ -1078,7 +1078,7 @@
        
            wf("$vhost_conf_dir/ispconfig.vhost", $content);
        
            if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
            //if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1088,7 +1088,7 @@
                exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
                exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');
            
            }
            //}
        
            //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
            //* and create the symlink
install/lib/installer_base.lib.php
@@ -1923,7 +1923,7 @@
                    symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
                }
            }
            if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
            //if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
@@ -1932,7 +1932,7 @@
                exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                symlink($install_dir.'/interface/web','/var/www/ispconfig');
                exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
            }
            //}
        }
        if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){