Fixed a issue with the remoteaction_core_module.

tbrehm

2010-10-05 01fff5ea95edc34afcb6c0ad003c327e81f00a39

 install/dist/lib/opensuse.lib.php

@@ -271,6 +271,8 @@
      $content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
      $content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
      wf("$pam/smtp", $content);
      // On some OSes smtp is world readable which allows for reading database information.  Removing world readable rights should have no effect.
      if(is_file("$pam/smtp"))    exec("chmod o= $pam/smtp");
      //exec("chmod 660 $pam/smtp");
      //exec("chown root:root $pam/smtp");
   
@@ -381,7 +383,7 @@
      
      // amavisd user config file
      $configfile = 'opensuse_amavisd_conf';
      if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
      if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
      if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
      $content = rf("tpl/".$configfile.".master");
      $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);
@@ -516,7 +518,8 @@
      exec('mkdir -p /var/log/ispconfig/httpd');
      
      //if(is_file('/etc/suphp.conf')) {
      replaceLine('/etc/suphp.conf','php=php','x-httpd-suphp=php:/srv/www/cgi-bin/php5',0,0);
      replaceLine('/etc/suphp.conf','php=php','x-httpd-suphp="php:/srv/www/cgi-bin/php5"',0,0);
      replaceLine('/etc/suphp.conf','php="php','x-httpd-suphp="php:/srv/www/cgi-bin/php5"',0,0);
      replaceLine('/etc/suphp.conf','docroot=','docroot=/srv/www',0,0);
      replaceLine('/etc/suphp.conf','umask=0077','umask=0022',0);
      //}
@@ -630,8 +633,7 @@
        unset($iptables_location);

   }
	
	

   public function install_ispconfig()
    {
      global $conf;
@@ -835,6 +837,12 @@
         $content = str_replace('{vhost_port_listen}', '', $content);
      }
      
      if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
         $content = str_replace('{ssl_comment}', '', $content);
      } else {
         $content = str_replace('{ssl_comment}', '#', $content);
      }
		
      $content = str_replace('/var/www/', '/srv/www/', $content);
      
      wf("$vhost_conf_dir/ispconfig.vhost", $content);
@@ -893,8 +901,8 @@
      exec('chmod a+rx /usr/local/ispconfig/interface/web');
      
      //* Create the ispconfig log directory
      if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
      if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
      if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir']);
      if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
      
      exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
      exec('chown getmail /usr/local/bin/run-getmail.sh');
@@ -984,4 +992,4 @@

}

?>
?>