From e5b006009006dbd738a8a11cf2415bb9a30580d0 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 21 Jul 2020 15:17:58 +0200
Subject: [PATCH] Fixed issue with security_settings.ini not being creted on
CentOS.
---
install/dist/lib/fedora.lib.php | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 3af8746908..6a1c5048e8 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -953,24 +953,13 @@ class installer_dist extends installer_base {
//* copy the ISPConfig security part
$command = 'cp -rf ../security '.$install_dir;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
- //* Apply changed security_settings.ini values to new security_settings.ini file
- if(is_file('/usr/local/ispconfig/security/security_settings.ini~')) {
- $security_settings_old = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini~'));
- $security_settings_new = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
- if(is_array($security_settings_new) && is_array($security_settings_old)) {
- foreach($security_settings_new as $section => $sval) {
- if(is_array($sval)) {
- foreach($sval as $key => $val) {
- if(isset($security_settings_old[$section]) && isset($security_settings_old[$section][$key])) {
- $security_settings_new[$section][$key] = $security_settings_old[$section][$key];
- }
- }
- }
- }
- file_put_contents('/usr/local/ispconfig/security/security_settings.ini',array_to_ini($security_settings_new));
- }
+
+ $configfile = 'security_settings.ini';
+ if(is_file($install_dir.'/security/'.$configfile)) {
+ copy($install_dir.'/security/'.$configfile, $install_dir.'/security/'.$configfile.'~');
}
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+ wf($install_dir.'/security/'.$configfile, $content);
//* Create a symlink, so ISPConfig is accessible via web
// Replaced by a separate vhost definition for port 8080
--
GitLab