Fixed a problem with the language setting on updates.

tbrehm

2009-05-25 5898e68138656182bf2fc20e95af97b82242c0da

 install/dist/lib/fedora.lib.php

@@ -83,7 +83,7 @@
      $postconf_commands = array (
         'myhostname = '.$conf['hostname'],
         'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
         'mynetworks = 127.0.0.0/8',
         'mynetworks = 127.0.0.0/8 [::1]/128',
         'virtual_alias_domains =',
         'virtual_alias_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_forwardings.cf, mysql:'.$config_dir.'/mysql-virtual_email2email.cf',
         'virtual_mailbox_domains = proxy:mysql:'.$config_dir.'/mysql-virtual_domains.cf',
@@ -208,6 +208,8 @@
      $configfile = 'tpl/fedora_saslauthd_smtpd_conf.master';
      $content = rf($configfile);
      wf('/usr/lib/sasl2/smtpd.conf',$content);
      if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl/smtpd.conf',$content);
      if(is_dir('/usr/lib64')) wf('/usr/lib64/sasl2/smtpd.conf',$content);
      
   }
   
@@ -554,6 +556,8 @@
      $content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
      
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
      $content = str_replace('{language}', $conf['language'], $content);
		
      wf("$install_dir/interface/lib/$configfile", $content);
      
      //* Create the config file for ISPConfig server
@@ -574,6 +578,8 @@
      
      $content = str_replace('{server_id}', $conf['server_id'], $content);
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
      $content = str_replace('{language}', $conf['language'], $content);
		
      wf("$install_dir/server/lib/$configfile", $content);
      
      
@@ -743,8 +749,8 @@
      exec('chmod 700 /usr/local/ispconfig/server/scripts/update_from_tgz.sh');
      exec('chown root /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
      exec('chmod 700 /usr/local/ispconfig/server/scripts/ispconfig_update.sh');
      exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
      exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
      if(!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update_from_svn.sh');
      if(!is_link('/usr/local/bin/ispconfig_update.sh')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_update.sh /usr/local/bin/ispconfig_update.sh');
      
      // set the fast cgi starter script to executable
      // exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
@@ -764,8 +770,9 @@
      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');
      
      exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');
      exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');
      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');
      exec('chmod 744 /usr/local/bin/run-getmail.sh');
      
      
   }
@@ -827,7 +834,7 @@
         $existing_cron_jobs = file('crontab.txt');
      
         $cron_jobs = array(
                '*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
                '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
            );
      
         // remove existing ispconfig cronjobs, in case the syntax has changed