From aa3ea245dd208d5b80afdb6f8ef35c9d6409d7cd Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 26 Sep 2010 09:25:29 -0400
Subject: [PATCH] Implemented: FS#1325 - Option to create remoting user automatically during package installation from repository Implemented: VAT-ID and customer No. fields for client and reseller.
---
install/lib/installer_base.lib.php | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 1c6895c..dc7c4ae 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -605,7 +605,7 @@
// Recursively create the spool directory
- mkdir('/var/spool/postfix/var/run/saslauthd', 0755, true);
+ if(!@is_dir('/var/spool/postfix/var/run/saslauthd')) mkdir('/var/spool/postfix/var/run/saslauthd', 0755, true);
// Edit the file /etc/default/saslauthd
$configfile = $conf['saslauthd']['config'];
@@ -820,7 +820,7 @@
$config_dir = $conf['getmail']['config_dir'];
- if(!is_dir($config_dir)) mkdir(escapeshellcmd($config_dir), 0700, true);
+ if(!@is_dir($config_dir)) mkdir(escapeshellcmd($config_dir), 0700, true);
$command = 'useradd -d '.$config_dir.' getmail';
if(!is_user('getmail')) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -949,7 +949,7 @@
//* Create the slave subdirectory
$content .= 'slave';
- mkdir($content, 0770, true);
+ if(!@is_dir($content)) mkdir($content, 0770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
@@ -963,7 +963,7 @@
global $conf;
//* Create the logging directory for the vhost logfiles
- mkdir('/var/log/ispconfig/httpd', 0755, true);
+ if(!@is_dir($conf['ispconfig_log_dir'].'/httpd')) mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
if(is_file('/etc/suphp/suphp.conf')) {
replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp="php:/usr/bin/php-cgi"',0);
@@ -1127,7 +1127,7 @@
$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- mkdir($install_dir, 0755, true);
+ if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
chown($install_dir, $apps_vhost_user);
chgrp($install_dir, $apps_vhost_group);
@@ -1182,7 +1182,7 @@
$ssl_csr_file = $install_dir.'/interface/ssl/ispserver.csr';
$ssl_key_file = $install_dir.'/interface/ssl/ispserver.key';
- if(!is_dir($install_dir.'/interface/ssl')) mkdir($install_dir.'/interface/ssl', 0755, true);
+ if(!@is_dir($install_dir.'/interface/ssl')) mkdir($install_dir.'/interface/ssl', 0755, true);
$ssl_pw = substr(md5(mt_rand()),0,6);
exec("openssl genrsa -des3 -passout pass:$ssl_pw -out $ssl_key_file 4096");
@@ -1426,7 +1426,7 @@
$content = str_replace('{vhost_port_listen}', '', $content);
}
- if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir'/interface/ssl/ispserver.key')) {
+ if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
$content = str_replace('{ssl_comment}', '', $content);
} else {
$content = str_replace('{ssl_comment}', '#', $content);
@@ -1470,10 +1470,10 @@
if(@is_file('/var/log/clamav/clamav.log')) exec('chmod +r /var/log/clamav/clamav.log');
if(@is_file('/var/log/clamav/freshclam.log')) exec('chmod +r /var/log/clamav/freshclam.log');
- //* Create the ispconfig log directory
- if(!is_file('/var/log/ispconfig/ispconfig.log')) {
- if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig', 0755);
- touch('/var/log/ispconfig/ispconfig.log');
+ //* Create the ispconfig log file and directory
+ if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
+ if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755);
+ touch($conf['ispconfig_log_dir'].'/ispconfig.log');
}
rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');
@@ -1486,14 +1486,14 @@
/* We rotate these logs in cron_daily.php
$fh = fopen('/etc/logrotate.d/logispc3', 'w');
fwrite($fh,
- "/var/log/ispconfig/ispconfig.log { \n" .
+ "$conf['ispconfig_log_dir']/ispconfig.log { \n" .
" weekly \n" .
" missingok \n" .
" rotate 4 \n" .
" compress \n" .
" delaycompress \n" .
"} \n" .
- "/var/log/ispconfig/cron.log { \n" .
+ "$conf['ispconfig_log_dir']/cron.log { \n" .
" weekly \n" .
" missingok \n" .
" rotate 4 \n" .
@@ -1544,8 +1544,8 @@
}
$root_cron_jobs = array(
- "* * * * * $install_dir/server/server.sh > /dev/null 2>> /var/log/ispconfig/cron.log",
- "30 00 * * * $install_dir/server/cron_daily.sh > /dev/null 2>> /var/log/ispconfig/cron.log"
+ "* * * * * ".$install_dir."/server/server.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log",
+ "30 00 * * * ".$install_dir."/server/cron_daily.sh > /dev/null 2>> ".$conf['ispconfig_log_dir']."/cron.log"
);
foreach($root_cron_jobs as $cron_job) {
if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
@@ -1563,7 +1563,7 @@
$existing_cron_jobs = file('crontab.txt');
$cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+ '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> '.$conf['ispconfig_log_dir'].'/cron.log'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
@@ -1581,8 +1581,8 @@
unlink('crontab.txt');
}
- touch('/var/log/ispconfig/cron.log');
- chmod('/var/log/ispconfig/cron.log', 0666);
+ touch($conf['ispconfig_log_dir'].'/cron.log');
+ chmod($conf['ispconfig_log_dir'].'/cron.log', 0666);
}
--
Gitblit v1.9.1