From 2b3b4cfe53e93823e11da9dc6c898b43e43cfa70 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 28 Feb 2016 11:14:17 -0500
Subject: [PATCH] more detaled informations during install/setup when mysql is not using NO_ENGINE_SUBSTITUTION
---
install/lib/installer_base.lib.php | 111 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 64 insertions(+), 47 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2522971..bbf8cfd 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -217,7 +217,12 @@
//* check sql-mode
$check_sql_mode = $this->db->queryOneRecord("SELECT @@sql_mode");
- if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') die('Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION');
+ if ($check_sql_mode['@@sql_mode'] != '' && $check_sql_mode['@@sql_mode'] != 'NO_ENGINE_SUBSTITUTION') {
+ echo "Wrong SQL-mode. You should use NO_ENGINE_SUBSTITUTION. Add\n\n";
+ echo " sql-mode=\"NO_ENGINE_SUBSTITUTION\"\n\n";
+ echo"to the mysqld-section in /etc/mysql/my.cnf and restart mysqld afterwards\n";
+ die();
+ }
//** Create the database
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS ?? DEFAULT CHARACTER SET ?', $conf['mysql']['database'], $conf['mysql']['charset'])) {
@@ -263,18 +268,14 @@
}
// Delete ISPConfig user in the local database, in case that it exists
- $this->db->query("DELETE FROM mysql.user WHERE User = ? AND Host = ?", $conf['mysql']['ispconfig_user'], $from_host);
- $this->db->query("DELETE FROM mysql.db WHERE Db = ? AND Host = ?", $conf['mysql']['database'], $from_host);
- $this->db->query('FLUSH PRIVILEGES');
+ $this->db->query("DROP USER ?@?", $conf['mysql']['ispconfig_user'], $from_host);
+ $this->db->query("DROP DATABASE IF EXISTS ?", $conf['mysql']['database']);
//* Create the ISPConfig database user in the local database
$query = 'GRANT SELECT, INSERT, UPDATE, DELETE ON ?? TO ?@? IDENTIFIED BY ?';
if(!$this->db->query($query, $conf['mysql']['database'] . ".*", $conf['mysql']['ispconfig_user'], $from_host, $conf['mysql']['ispconfig_password'])) {
$this->error('Unable to create database user: '.$conf['mysql']['ispconfig_user'].' Error: '.$this->db->errorMessage);
}
-
- //* Reload database privelages
- $this->db->query('FLUSH PRIVILEGES;');
//* Set the database name in the DB library
$this->db->setDBName($conf['mysql']['database']);
@@ -655,10 +656,6 @@
}
}
- /*
- * It is all done. Relod the rights...
- */
- $this->dbmaster->query('FLUSH PRIVILEGES');
}
}
@@ -793,10 +790,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 = '') {
@@ -896,6 +908,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'],
@@ -903,6 +917,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');
@@ -932,6 +947,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~');
@@ -964,10 +1000,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) {
@@ -1143,16 +1179,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", $out, $ret); //* Postfix 2.9
- if (!isset($out[0])) exec ("postconf -M dovecot/unix", $out, $ret); //* Postfix >= 2.11
- $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');
@@ -1162,7 +1191,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);
@@ -1284,25 +1313,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
@@ -1452,9 +1468,6 @@
if(!$this->db->query($query, $conf['powerdns']['database'] . '.*', $conf['mysql']['ispconfig_user'])) {
$this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage);
}
-
- //* Reload database privelages
- $this->db->query('FLUSH PRIVILEGES');
//* load the powerdns databse dump
if($conf['mysql']['admin_password'] == '') {
@@ -2052,6 +2065,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);
--
Gitblit v1.9.1