From 0799f83bf5f93eb51216263d25ff821fc7c67e3a Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 23 Aug 2012 13:48:39 +0000 Subject: [PATCH] Fixed problem with ispconfig auth.log permissions. --- install/dist/lib/fedora.lib.php | 7 +++++++ install/dist/lib/gentoo.lib.php | 7 +++++++ install/dist/lib/opensuse.lib.php | 7 +++++++ install/lib/install.lib.php | 2 +- install/lib/installer_base.lib.php | 4 ++-- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 1f2e8572a..67c156f17 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 b08a05f4b..4d4ada8a1 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 f33fc8464..1a8e3c8a0 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 ea01c2cbc..f901264bc 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 9fec15855..d11acd1f6 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'); -- GitLab