Skip to content
Snippets Groups Projects
Commit af5c9b98 authored by tbrehm's avatar tbrehm
Browse files

Fixed a bug in updater when the bastille configuration is saved during a update.

parent 01074a6e
No related branches found
No related tags found
No related merge requests found
...@@ -536,6 +536,8 @@ class installer_base { ...@@ -536,6 +536,8 @@ class installer_base {
public function configure_getmail() public function configure_getmail()
{ {
global $conf;
$config_dir = $conf['getmail']['config_dir']; $config_dir = $conf['getmail']['config_dir'];
if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir)); if(!is_dir($config_dir)) exec("mkdir -p ".escapeshellcmd($config_dir));
...@@ -601,6 +603,8 @@ class installer_base { ...@@ -601,6 +603,8 @@ class installer_base {
public function configure_apache() public function configure_apache()
{ {
global $conf;
//* Create the logging directory for the vhost logfiles //* Create the logging directory for the vhost logfiles
exec('mkdir -p /var/log/ispconfig/httpd'); exec('mkdir -p /var/log/ispconfig/httpd');
...@@ -612,6 +616,7 @@ class installer_base { ...@@ -612,6 +616,7 @@ class installer_base {
$dist_init_scripts = $conf['init_scripts']; $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__); if(is_dir("/etc/Bastille")) caselog("mv -f /etc/Bastille /etc/Bastille.backup", __FILE__, __LINE__);
@mkdir("/etc/Bastille", octdec($directory_mode)); @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__); if(is_dir("/etc/Bastille.backup/firewall.d")) caselog("cp -pfr /etc/Bastille.backup/firewall.d /etc/Bastille/", __FILE__, __LINE__);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment