diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 1f2e8572a1f425afd86aaef73bedea373a03d73b..67c156f170ebd4f5fa4b483f56190866ba864991 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -1056,6 +1056,13 @@ class installer_dist extends installer_base { exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices')); } + //* 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'); + } + exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log'); + exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log'); + //* Remove Domain module as its functions are available in the client module now if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index b08a05f4b860cf98e8b63b0e1ec00dba72a3a36b..4d4ada8a108fb017cea5b1a5eb5455e82c34c5a8 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -1032,6 +1032,13 @@ class installer extends installer_base touch($conf['ispconfig_log_dir'].'/ispconfig.log'); } + //* 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'); + } + exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log'); + exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log'); + rename($install_dir.'/server/scripts/run-getmail.sh', '/usr/local/bin/run-getmail.sh'); if (is_user('getmail')) { diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index f33fc84642f393fc41dbdff8c7a1cd212e9c8f7b..1a8e3c8a0936ded26c4a640be20ec88bb2fa1a3b 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -1098,6 +1098,13 @@ class installer_dist extends installer_base { exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices')); } + //* 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'); + } + exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log'); + exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log'); + //* Remove Domain module as its functions are available in the client module now if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain'); diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index ea01c2cbc91953b5763054ccadb7ff3b35f0573e..f901264bced2927de4173e4073fd54977011e22f 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -723,7 +723,7 @@ function get_ispconfig_port_number() { if(is_file($ispconfig_vhost_file)) { $tmp = file_get_contents($ispconfig_vhost_file); preg_match($regex,$tmp,$matches); - $port_number = intval($matches[1]); + $port_number = @intval($matches[1]); if($port_number > 0) { return $port_number; } else { diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 9fec15855916f27cf867c2c9122f79975bc5254d..d11acd1f63defd5dff1f2ce183015d74068b2ec6 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1962,9 +1962,9 @@ class installer_base { //* 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'); - exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log'); - exec('chmod 660 '. $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')) { rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh');