tbrehm
2012-08-17 b349c0bda24c5a0780f650f4e65ee9fce6a4df91
install/lib/installer_base.lib.php
@@ -900,7 +900,7 @@
      $content = rf($conf['postfix']['config_dir'].'/master.cf');
      // Only add the content if we had not addded it before
      if(!stristr($content,'dovecot/deliver')) {
         $deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
         $deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
         af($conf['postfix']['config_dir'].'/master.cf',$deliver_content);
      }
      unset($content);
@@ -1650,6 +1650,7 @@
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      wf($install_dir.'/interface/lib/'.$configfile, $content);
@@ -1673,6 +1674,7 @@
      $content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
      $content = str_replace('{language}', $conf['language'], $content);
      $content = str_replace('{timezone}', $conf['timezone'], $content);
      $content = str_replace('{theme}', $conf['theme'], $content);
      wf($install_dir.'/server/lib/'.$configfile, $content);
@@ -1957,9 +1959,11 @@
         touch($conf['ispconfig_log_dir'].'/ispconfig.log');
      }
      //* Create the ispconfig auth log file
      //* Create the ispconfig auth log file and set uid/gid
      if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {
         touch($conf['ispconfig_log_dir'].'/auth.log', 0666);
         touch($conf['ispconfig_log_dir'].'/auth.log');
         exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log');
         exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');
      }
      if(is_user('getmail')) {
@@ -2008,6 +2012,7 @@
      }
      $content = rf('tpl/mysql_clientdb.conf.master');
      $content = str_replace('{hostname}',$conf['mysql']['host'],$content);
      $content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
      $content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
      wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);