From 3117f2e70389b0a3e03a683ec8b03e4e0a7eea87 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 31 Jan 2016 10:00:34 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/installer_base.lib.php | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 7643043..2ca0e54 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -68,6 +68,12 @@
} else {
$input = $autoinstall[$name];
}
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
+ }
} else {
$answers_str = implode(',', $answers);
swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
@@ -104,6 +110,12 @@
$input = $default;
} else {
$input = $autoinstall[$name];
+ }
+ } elseif($name != '' && $autoupdate[$name] != '') {
+ if($autoupdate[$name] == 'default') {
+ $input = $default;
+ } else {
+ $input = $autoupdate[$name];
}
} else {
swrite($this->lng($query).' ['.$default.']: ');
@@ -1502,22 +1514,15 @@
//* Create the slave subdirectory
$content .= 'slave';
- if(!@is_dir($content)) mkdir($content, 2770, true);
+ if(!@is_dir($content)) mkdir($content, 02770, true);
//* Chown the slave subdirectory to $conf['bind']['bind_user']
chown($content, $conf['bind']['bind_user']);
chgrp($content, $conf['bind']['bind_group']);
- chmod($content, 2770);
+ chmod($content, 02770);
//* Install scripts for dnssec implementation
- $this->process_bind_file('dnssec-update.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-create.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-delete.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autoupdate.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autopickup.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-autocreate.sh', '/server/scripts/');
- $this->process_bind_file('dnssec-config.sh', '/server/scripts/');
-
+ $this->process_bind_file('named.conf.options', '/etc/bind/', true); //TODO replace hardcoded path
}
@@ -1666,6 +1671,11 @@
// Comment out the namevirtualhost lines, as they were added by ispconfig in ispconfig.conf file again
replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:80', '# NameVirtualHost *:80', 1);
replaceLine('/etc/apache2/ports.conf', 'NameVirtualHost *:443', '# NameVirtualHost *:443', 1);
+ }
+
+ if(is_file('/etc/apache2/mods-available/fcgid.conf')) {
+ // add or modify the parameters for fcgid.conf
+ replaceLine('/etc/apache2/mods-available/fcgid.conf','MaxRequestLen','MaxRequestLen 15728640',1);
}
if(is_file('/etc/apache2/apache.conf')) {
@@ -2852,4 +2862,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1