From b0f818efec0b74741d6fa53d0e86a95065d4e2d1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 12 Feb 2016 11:06:36 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/installer_base.lib.php | 120 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 7643043..f2b7041 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.']: ');
@@ -781,10 +793,25 @@
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
}
- //* with postfix >= 2.9 we can detect configured services with postconf
- public function postfix_master() {
- exec("postconf -M", $out, $ret);
- return $ret===0?true:false;
+ public function get_postfix_service($service, $type) {
+ global $conf;
+
+ exec("postconf -M", $out, $ret);
+
+ if ($ret === 0) { //* with postfix >= 2.9 we can detect configured services with postconf
+ unset($out);
+ exec ("postconf -M $service/$type 2> /dev/null", $out, $ret); //* Postfix >= 2.11
+ if (!isset($out[0])) { //* try Postfix 2.9
+ exec ("postconf -M $service.$type 2> /dev/null", $out, $ret);
+ }
+ $postfix_service = @($out[0]=='')?false:true;
+ } else { //* fallback - Postfix < 2.9
+ rf($conf['postfix']['config_dir'].'/master.cf');
+ $regex = '/[^#]'.$service.'.*.'.$type.'.*/';
+ $postfix_service = @(!preg_match($regex, $content))?true:false;
+ }
+
+ return $postfix_service;
}
public function configure_postfix($options = '') {
@@ -884,6 +911,8 @@
}
unset($server_ini_array);
+ $tmp = str_replace('.','\.',$conf['hostname']);
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
@@ -891,6 +920,7 @@
'{rbl_list}' => $rbl_list,
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
+ '{myhostname}' => $tmp,
);
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
@@ -920,6 +950,27 @@
exec('postmap /var/lib/mailman/data/virtual-mailman');
if(!is_file('/var/lib/mailman/data/transport-mailman')) touch('/var/lib/mailman/data/transport-mailman');
exec('/usr/sbin/postmap /var/lib/mailman/data/transport-mailman');
+
+ //* Create auxillary postfix conf files
+ $configfile = 'helo_access';
+ if(is_file($config_dir.'/'.$configfile)) {
+ copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
+ chmod($config_dir.'/'.$configfile.'~', 0400);
+ }
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+ $content = strtr($content, $postconf_placeholders);
+ # todo: look up this server's ip addrs and loop through each
+ # todo: look up domains hosted on this server and loop through each
+ wf($config_dir.'/'.$configfile, $content);
+
+ $configfile = 'blacklist_helo';
+ if(is_file($config_dir.'/'.$configfile)) {
+ copy($config_dir.'/'.$configfile, $config_dir.'/'.$configfile.'~');
+ chmod($config_dir.'/'.$configfile.'~', 0400);
+ }
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+ $content = strtr($content, $postconf_placeholders);
+ wf($config_dir.'/'.$configfile, $content);
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
@@ -952,10 +1003,10 @@
//* Check maildrop service in posfix master.cf
$regex = "/^maildrop unix.*pipe flags=DRhu user=vmail argv=\\/usr\\/bin\\/maildrop -d ".$cf['vmail_username']." \\$\{extension} \\$\{recipient} \\$\{user} \\$\{nexthop} \\$\{sender}/";
$configfile = $config_dir.'/master.cf';
- if ($this->postfix_master()) {
+ if($this->get_postfix_service('maildrop', 'unix')) {
exec ("postconf -M maildrop.unix &> /dev/null", $out, $ret);
$change_maildrop_flags = @(preg_match($regex, $out[0]) && $out[0] !='')?false:true;
- } else { //* fallback - postfix < 2.9
+ } else {
$change_maildrop_flags = @(preg_match($regex, $configfile))?false:true;
}
if ($change_maildrop_flags) {
@@ -1131,15 +1182,9 @@
}
$config_dir = $conf['postfix']['config_dir'];
+
//* Configure master.cf and add a line for deliver
- if ($this->postfix_master()) {
- exec ("postconf -M dovecot.unix &> /dev/null", $out, $ret);
- $add_dovecot_service = @($out[0]=='')?true:false;
- } else { //* fallback - postfix < 2.9
- $content = rf($config_dir.'/master.cf');
- $add_dovecot_service = @(!stristr($content, "dovecot/deliver"))?true:false;
- }
- if($add_dovecot_service) {
+ if(!$this->get_postfix_service('dovecot', 'unix')) {
//* backup
if(is_file($config_dir.'/master.cf')){
copy($config_dir.'/master.cf', $config_dir.'/master.cf~2');
@@ -1149,7 +1194,7 @@
}
//* Configure master.cf and add a line for deliver
$content = rf($conf["postfix"]["config_dir"].'/master.cf');
- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
af($config_dir.'/master.cf', $deliver_content);
unset($content);
unset($deliver_content);
@@ -1271,25 +1316,12 @@
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
- $config_dir = $conf['postfix'];
+ $config_dir = $conf['postfix']['config_dir'];
// Adding amavis-services to the master.cf file if the service does not already exists
- if ($this->postfix_master()) {
- exec ("postconf -M amavis.unix &> /dev/null", $out, $ret);
- $add_amavis = @($out[0]=='')?true:false;
- unset($out);
- exec ("postconf -M 127.0.0.1:10025.inet &> /dev/null", $out, $ret);
- $add_amavis_10025 = @($out[0]=='')?true:false;
- unset($out);
- exec ("postconf -M 127.0.0.1:10027.inet &> /dev/null", $out, $ret);
- $add_amavis_10027 = @($out[0]=='')?true:false;
- unset($out);
- } else { //* fallback - postfix < 2.9
- $content = rf($conf['postfix']['config_dir'].'/master.cf');
- $add_amavis = @(!preg_match('/^amavis\s+unix\s+/m', $content))?true:false;
- $add_amavis_10025 = @(!preg_match('/^127.0.0.1:10025\s+/m', $content))?true:false;
- $add_amavis_10027 = @(!preg_match('/^127.0.0.1:10027\s+/m', $content))?true:false;
- }
+ $add_amavis = !$this->get_postfix_service('amavis','unix');
+ $add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
+ $add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
//* backup master.cf
@@ -1502,22 +1534,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 +1691,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')) {
@@ -2041,6 +2071,10 @@
}
$content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $content);
+
+ // SSL in apps vhost is off by default. Might change later.
+ $content = str_replace('{ssl_on}', 'off', $content);
+ $content = str_replace('{ssl_comment}', '#', $content);
wf($vhost_conf_dir.'/apps.vhost', $content);
@@ -2852,4 +2886,4 @@
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1