From bd253618c2c6cbeed88d4b40be1520a1fc0bfc97 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 27 Sep 2022 13:03:31 +0200 Subject: [PATCH 1/5] Fixed issue #6389 mail server not configured correctly --- install/lib/installer_base.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index a73b9d0922..cb53fb6d0c 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1653,7 +1653,7 @@ class installer_base { //* These postconf commands will be executed on installation and update $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server, config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']); $server_ini_array = ini_to_array(stripslashes($server_ini_rec['config'])); - $mail_server = ($server_ini_rec['mail_server']) ? true : false; + $mail_server = $conf['services']['mail']; unset($server_ini_rec); // amavisd user config file @@ -1777,7 +1777,7 @@ class installer_base { //* These postconf commands will be executed on installation and update $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server, config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']); $server_ini_array = ini_to_array(stripslashes($server_ini_rec['config'])); - $mail_server = ($server_ini_rec['mail_server']) ? true : false; + $mail_server = $conf['services']['mail']; unset($server_ini_rec); $config_dir = $conf['postfix']['config_dir']; -- GitLab From 529ee6a6beda50c2f4283bdc20bbcb26ce9556f1 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 27 Sep 2022 20:20:53 +0200 Subject: [PATCH 2/5] Set umask in build environment --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a4bf8148..927e83fe06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,6 +76,10 @@ syntax_diff:lint: # # needs: ["syntax:lint"] +# Define commands that run before each job's script +before_script: + - umask 002 # set permissions to default directory permissions of 775 and default file permissions are 664, + build:package: stage: build image: edbizarro/gitlab-ci-pipeline-php:7.2 -- GitLab From 8b52d3dbadfebf8162b1a9c709924a6c550502bd Mon Sep 17 00:00:00 2001 From: Thom Date: Thu, 29 Sep 2022 17:35:24 +0000 Subject: [PATCH 3/5] Remove umask setting in before_script section of .gitlab-ci.yml --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 927e83fe06..e7a4bf8148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,10 +76,6 @@ syntax_diff:lint: # # needs: ["syntax:lint"] -# Define commands that run before each job's script -before_script: - - umask 002 # set permissions to default directory permissions of 775 and default file permissions are 664, - build:package: stage: build image: edbizarro/gitlab-ci-pipeline-php:7.2 -- GitLab From a51d6a96a02470fe2c5575d094db40a27870b9c3 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 29 Sep 2022 17:39:09 +0000 Subject: [PATCH 4/5] Set file permissions in the tar command of the ISPConfig release build script. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a4bf8148..75301f8723 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ build:package: - if [[ "$VER" == "" ]] ; then VER="3.2dev"$(date +%s) ; fi - if [[ "$VER" != "" ]] ; then echo "Replacing 3.2dev by $VER" ; sed -i -r 's/3\.2dev/'${VER}'/g' install/tpl/config.inc.php.master install/sql/ispconfig3.sql ; fi - RET=0 - - tar -cpzf ISPConfig-${VER}.tar.gz --exclude "ISPConfig-${VER}.tar.gz" --exclude ".git*" --exclude ".phplint.yml" --transform 's,^\./,ispconfig3_install/,' . || RET=$? + - tar -cpzf ISPConfig-${VER}.tar.gz --exclude "ISPConfig-${VER}.tar.gz" --exclude ".git*" --exclude ".phplint.yml" --transform 's,^\./,ispconfig3_install/,' --mode='0775' ./* || RET=$? - if [[ $RET > 1 ]] ; then exit $RET ; fi - echo "Listing tar contents for verification" - tar -tvf ISPConfig-${VER}.tar.gz @@ -101,4 +101,4 @@ build:package: - echo "Download url is https://download.ispconfig.org/ISPConfig-${VER}.tar.gz" needs: ["syntax:lint"] - allow_failure: false \ No newline at end of file + allow_failure: false -- GitLab From 89ebae072242e2f8da643ab9ec45f5009809e4c5 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Thu, 29 Sep 2022 18:19:53 +0000 Subject: [PATCH 5/5] Fix warning that the file /etc/rspamd/local.d/worker-controller.inc does not exists during installation. --- install/lib/installer_base.lib.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index cb53fb6d0c..d9bd7d2326 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1981,8 +1981,13 @@ class installer_base { exec('chmod a+r /etc/rspamd/local.d/* /etc/rspamd/local.d/maps.d/* /etc/rspamd/override.d/*'); # protect passwords in these files - exec('chgrp _rspamd /etc/rspamd/local.d/redis.conf /etc/rspamd/local.d/classifier-bayes.conf /etc/rspamd/local.d/worker-controller.inc'); - exec('chmod 640 /etc/rspamd/local.d/redis.conf /etc/rspamd/local.d/classifier-bayes.conf /etc/rspamd/local.d/worker-controller.inc'); + exec('chgrp _rspamd /etc/rspamd/local.d/redis.conf /etc/rspamd/local.d/classifier-bayes.conf'); + exec('chmod 640 /etc/rspamd/local.d/redis.conf /etc/rspamd/local.d/classifier-bayes.conf'); + + if(file_exists('/etc/rspamd/local.d/worker-controller.inc')) { + exec('chgrp _rspamd /etc/rspamd/local.d/worker-controller.inc'); + exec('chmod 640 /etc/rspamd/local.d/worker-controller.inc'); + } # unneccesary, since this was done above? $command = 'usermod -a -G amavis _rspamd'; -- GitLab