Merge branch '5970-confidential-issue' into 'develop'

Marius Burkard · Marius Burkard · commit a739ab22d8d4 · 2021-01-04T14:53:36.000+01:00
5970 confidential issue

See merge request ispconfig-confidential/ispconfig3!4
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -1372,6 +1372,7 @@ public function install_ispconfig()
 		//* Create the ispconfig log directory
 		if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir']);
 		if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
+		chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);
 
 		if(is_user('getmail')) {
 			exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -1252,6 +1252,7 @@ public function install_ispconfig()
 		if (!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
 			touch($conf['ispconfig_log_dir'].'/ispconfig.log');
 		}
+		chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);
 
 		//* Create the ispconfig auth log file and set uid/gid
 		if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -1369,6 +1369,7 @@ public function install_ispconfig()
 		//* Create the ispconfig log directory
 		if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir']);
 		if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) exec('touch '.$conf['ispconfig_log_dir'].'/ispconfig.log');
+		chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);
 
 		if(is_user('getmail')) {
 			exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -3588,6 +3588,7 @@ public function install_ispconfig() {
 			if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755);
 			touch($conf['ispconfig_log_dir'].'/ispconfig.log');
 		}
+		chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);
 
 		//* Create the ispconfig auth log file and set uid/gid
 		if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {

Original file line number	Diff line number	Diff line change
`@@ -1252,6 +1252,7 @@ public function install_ispconfig()`
`1252`	`1252`	`if (!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {`
`1253`	`1253`	`touch($conf['ispconfig_log_dir'].'/ispconfig.log');`
`1254`	`1254`	`}`
	`1255`	`+ chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);`
`1255`	`1256`
`1256`	`1257`	`//* Create the ispconfig auth log file and set uid/gid`
`1257`	`1258`	`if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {`
Original file line number	Diff line number	Diff line change
`@@ -3588,6 +3588,7 @@ public function install_ispconfig() {`
`3588`	`3588`	`if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755);`
`3589`	`3589`	`touch($conf['ispconfig_log_dir'].'/ispconfig.log');`
`3590`	`3590`	`}`
	`3591`	`+ chmod($conf['ispconfig_log_dir'].'/ispconfig.log', 0600);`
`3591`	`3592`
`3592`	`3593`	`//* Create the ispconfig auth log file and set uid/gid`
`3593`	`3594`	`if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {`