- OpenSUSE: check if the line "include /etc/nginx/sites-enabled/*.vhost;" e...

ftimme

2011-09-26 dbe5b0c9687ca2b1dc2dd7c8f150899335eae329

 install/dist/lib/opensuse.lib.php

@@ -521,7 +521,7 @@
      replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
      //}
      
      // Sites enabled and avaulable dirs
      // Sites enabled and available dirs
      exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
      exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);
      
@@ -591,13 +591,16 @@
      //* Create the logging directory for the vhost logfiles
      if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
      
      // Sites enabled and avaulable dirs
      // Sites enabled and available dirs
      exec('mkdir -p '.$conf['nginx']['vhost_conf_enabled_dir']);
      exec('mkdir -p '.$conf['nginx']['vhost_conf_dir']);
      
      $content = trim(rf('/etc/nginx/nginx.conf'));
      $content = substr($content,0,-1)."\n    include /etc/nginx/sites-enabled/*.vhost;\n}";
      wf('/etc/nginx/nginx.conf',$content);
      $content = rf('/etc/nginx/nginx.conf');
      if(stripos($content, 'include /etc/nginx/sites-enabled/*.vhost;') === false){
         $content = trim($content);
         $content = substr($content,0,-1)."\n    include /etc/nginx/sites-enabled/*.vhost;\n}";
         wf('/etc/nginx/nginx.conf',$content);
      }
      unset($content);
      
      // create PHP-FPM pool dir
@@ -608,6 +611,15 @@
         af('/etc/php5/fpm/php-fpm.conf',"\ninclude=/etc/php5/fpm/pool.d/*.conf");
      }
      unset($content);
      if(!@is_file($conf['nginx']['php_fpm_ini_path'])){
         if(@is_file('/etc/php5/cli/php.ini')){
            exec('cp -f /etc/php5/cli/php.ini '.$conf['nginx']['php_fpm_ini_path']);
         } elseif(@is_file('/etc/php5/fastcgi/php.ini')){
            exec('cp -f /etc/php5/fastcgi/php.ini '.$conf['nginx']['php_fpm_ini_path']);
         } elseif(@is_file('/etc/php5/apache2/php.ini')){
            exec('cp -f /etc/php5/apache2/php.ini '.$conf['nginx']['php_fpm_ini_path']);
         }
      }

      //* make sure that webalizer finds its config file when it is directly in /etc
      if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
@@ -987,6 +999,10 @@
               symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
            }
         }
			
         // create symlinks from /usr/share to phpMyAdmin and SquirrelMail, if they are installed
         if(!@file_exists('/usr/share/phpmyadmin') && @is_dir('/srv/www/htdocs/phpMyAdmin')) symlink('/srv/www/htdocs/phpMyAdmin/','/usr/share/phpmyadmin');
         if(!@file_exists('/usr/share/squirrelmail') && @is_dir('/srv/www/htdocs/squirrelmail')) symlink('/srv/www/htdocs/squirrelmail/','/usr/share/squirrelmail');
      }