From af5c9b984d30b76b1562fce9a8e9a63fca5a1d90 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 18 Aug 2008 15:44:55 +0000
Subject: [PATCH] Fixed a bug in updater when the bastille configuration is
saved during a update.
---
install/lib/installer_base.lib.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ac29988373..9f60f48e1e 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -536,6 +536,8 @@ class installer_base {
public function configure_getmail()
{
+ global $conf;
+
$config_dir = $conf['getmail']['config_dir'];
if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
@@ -601,6 +603,8 @@ class installer_base {
public function configure_apache()
{
+ global $conf;
+
//* Create the logging directory for the vhost logfiles
exec('mkdir -p /var/log/ispconfig/httpd');
@@ -612,6 +616,7 @@ class installer_base {
$dist_init_scripts = $conf['init_scripts'];
+ if(is_dir("/etc/Bastille.backup")) caselog("rm -rf /etc/Bastille.backup", __FILE__, __LINE__);
if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__);
@mkdir("/etc/Bastille", octdec($directory_mode));
if(is_dir("/etc/Bastille.backup/firewall.d")) caselog("cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/", __FILE__, __LINE__);
--
GitLab