From 3bb9ef8a12ee71a16887ca73a86b6fc8eaa183fe Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Tue, 14 Apr 2015 18:08:05 -0400
Subject: [PATCH] changed sql-syntax
---
install/dist/lib/fedora.lib.php | 210 +++++++++++++++++++++++++++-------------------------
1 files changed, 108 insertions(+), 102 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 49403de..ecdb00f 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -143,6 +143,9 @@
//* mysql-virtual_sender.cf
$this->process_postfix_config('mysql-virtual_sender.cf');
+ //* mysql-virtual_sender_login_maps.cf
+ $this->process_postfix_config('mysql-virtual_sender_login_maps.cf');
+
//* mysql-virtual_client.cf
$this->process_postfix_config('mysql-virtual_client.cf');
@@ -151,6 +154,22 @@
//* mysql-virtual_relayrecipientmaps.cf
$this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');
+
+ //* mysql-virtual_policy_greylist.cf
+ $this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+
+ //* postfix-dkim
+ $full_file_name=$config_dir.'/tag_as_originating.re';
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.$configfile.'~');
+ }
+ wf($full_file_name, '/^/ FILTER amavis:[127.0.0.1]:10026');
+
+ $full_file_name=$config_dir.'/tag_as_foreign.re';
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.$configfile.'~');
+ }
+ wf($full_file_name, '/^/ FILTER amavis:[127.0.0.1]:10024');
//* Changing mode and group of the new created config files.
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
@@ -179,15 +198,28 @@
}
}
unset($rbl_hosts);
+
+ //* If Postgrey is installed, configure it
+ $greylisting = '';
+ if($conf['postgrey']['installed'] == true) {
+ $greylisting = ', check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
+ }
+
+ $reject_sender_login_mismatch = '';
+ if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
+ $reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
+ }
unset($server_ini_array);
-
- //* These postconf commands will be executed on installation and update
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
'{vmail_groupid}' => $cf['vmail_groupid'],
- '{rbl_list}' => $rbl_list);
-
+ '{rbl_list}' => $rbl_list,
+ '{greylisting}' => $greylisting,
+ '{reject_slm}' => $reject_sender_login_mismatch,
+ );
+
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
$postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
@@ -231,10 +263,10 @@
//* Create the SSL certificate
if(AUTOINSTALL){
$command = 'cd '.$config_dir.'; '
- ."openssl req -new -subj '/C=".$autoinstall['ssl_cert_country']."/ST=".$autoinstall['ssl_cert_state']."/L=".$autoinstall['ssl_cert_locality']."/O=".$autoinstall['ssl_cert_organisation']."/OU=".$autoinstall['ssl_cert_organisation_unit']."/CN=".$autoinstall['ssl_cert_common_name']."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
+ ."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
} else {
$command = 'cd '.$config_dir.'; '
- ."openssl req -new -subj '/C=".escapeshellcmd($autoinstall['ssl_cert_country'])."/ST=".escapeshellcmd($autoinstall['ssl_cert_state'])."/L=".escapeshellcmd($autoinstall['ssl_cert_locality'])."/O=".escapeshellcmd($autoinstall['ssl_cert_organisation'])."/OU=".escapeshellcmd($autoinstall['ssl_cert_organisation_unit'])."/CN=".escapeshellcmd($autoinstall['ssl_cert_common_name'])."' -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509";
+ .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:4096 -nodes -keyout smtpd.key -keyform PEM -days 3650 -x509';
}
exec($command);
@@ -368,6 +400,19 @@
{
global $conf;
+ $virtual_transport = 'dovecot';
+
+ // check if virtual_transport must be changed
+ if ($this->is_update) {
+ $tmp = $this->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
+ $ini_array = ini_to_array(stripslashes($tmp['config']));
+ // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
+
+ if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
+ $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+ }
+ }
+
$config_dir = $conf['dovecot']['config_dir'];
//* Use /etc/dovecot as config dir if exists
@@ -394,7 +439,7 @@
// Adding the amavisd commands to the postfix configuration
$postconf_commands = array (
'dovecot_destination_recipient_limit = 1',
- 'virtual_transport = dovecot',
+ 'virtual_transport = '.$virtual_transport,
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
);
@@ -416,17 +461,18 @@
//* Get the dovecot version
exec('dovecot --version', $tmp);
- $parts = explode('.', trim($tmp[0]));
- $dovecot_version = $parts[0];
+ $dovecot_version = $tmp[0];
unset($tmp);
- unset($parts);
//* Copy dovecot configuration file
- if($dovecot_version == 2) {
+ if(version_compare($dovecot_version,2) >= 0) {
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master')) {
copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
} else {
copy('tpl/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
+ }
+ if(version_compare($dovecot_version,2.1) < 0) {
+ removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
}
} else {
if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) {
@@ -494,13 +540,25 @@
}
// Append the configuration for amavisd to the master.cf file
- if(is_file($conf["postfix"]["config_dir"].'/master.cf')) copy($conf["postfix"]["config_dir"].'/master.cf', $conf["postfix"]["config_dir"].'/master.cf~');
- $content = rf($conf["postfix"]["config_dir"].'/master.cf');
+ if(is_file($conf['postfix']['config_dir'].'/master.cf')) copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~');
+ $content = rf($conf['postfix']['config_dir'].'/master.cf');
// Only add the content if we had not addded it before
- if(!stristr($content, "127.0.0.1:10025")) {
+ if(!preg_match('/^amavis\s+unix\s+/m', $content)) {
unset($content);
- $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', "tpl/master_cf_amavis.master");
- af($conf["postfix"]["config_dir"].'/master.cf', $content);
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis.master', 'tpl/master_cf_amavis.master');
+ af($conf['postfix']['config_dir'].'/master.cf', $content);
+ $content = rf($conf['postfix']['config_dir'].'/master.cf');
+ }
+ if(!preg_match('/^127.0.0.1:10025\s+/m', $content)) {
+ unset($content);
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10025.master', 'tpl/master_cf_amavis10025.master');
+ af($conf['postfix']['config_dir'].'/master.cf', $content);
+ $content = rf($conf['postfix']['config_dir'].'/master.cf');
+ }
+ if(!preg_match('/^127.0.0.1:10027\s+/m', $content)) {
+ unset($content);
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/master_cf_amavis10027.master', 'tpl/master_cf_amavis10027.master');
+ af($conf['postfix']['config_dir'].'/master.cf', $content);
}
unset($content);
@@ -833,9 +891,30 @@
$command = "cp -rf ../server $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ //* Make a backup of the security settings
+ if(is_file('/usr/local/ispconfig/security/security_settings.ini')) copy('/usr/local/ispconfig/security/security_settings.ini','/usr/local/ispconfig/security/security_settings.ini~');
+
//* copy the ISPConfig security part
$command = 'cp -rf ../security '.$install_dir;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+
+ //* Apply changed security_settings.ini values to new security_settings.ini file
+ if(is_file('/usr/local/ispconfig/security/security_settings.ini~')) {
+ $security_settings_old = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini~'));
+ $security_settings_new = ini_to_array(file_get_contents('/usr/local/ispconfig/security/security_settings.ini'));
+ if(is_array($security_settings_new) && is_array($security_settings_old)) {
+ foreach($security_settings_new as $section => $sval) {
+ if(is_array($sval)) {
+ foreach($sval as $key => $val) {
+ if(isset($security_settings_old[$section]) && isset($security_settings_old[$section][$key])) {
+ $security_settings_new[$section][$key] = $security_settings_old[$section][$key];
+ }
+ }
+ }
+ }
+ file_put_contents('/usr/local/ispconfig/security/security_settings.ini',array_to_ini($security_settings_new));
+ }
+ }
//* Create a symlink, so ISPConfig is accessible via web
// Replaced by a separate vhost definition for port 8080
@@ -989,6 +1068,12 @@
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
$command = 'chown root:ispconfig '.$install_dir.'/security';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ $command = 'chown root:ispconfig '.$install_dir.'/security/ids.whitelist';
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ $command = 'chown root:ispconfig '.$install_dir.'/security/ids.htmlfield';
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ $command = 'chown root:ispconfig '.$install_dir.'/security/apache_directives.blacklist';
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
//* Make the global language file directory group writable
exec("chmod -R 770 $install_dir/interface/lib/lang");
@@ -1030,6 +1115,13 @@
exec("chmod 600 $install_dir/server/lib/mysql_clientdb.conf");
exec("chown root:root $install_dir/server/lib/mysql_clientdb.conf");
}
+
+ if(is_dir($install_dir.'/interface/invoices')) {
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
+ }
+
+ exec('chown -R root:root /usr/local/ispconfig/interface/ssl');
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
// and must be fixed as this will allow the apache user to read the ispconfig files.
@@ -1238,92 +1330,6 @@
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
-
- public function configure_dbserver()
- {
- global $conf;
-
- //* If this server shall act as database server for client DB's, we configure this here
- $install_dir = $conf['ispconfig_install_dir'];
-
- // Create a file with the database login details which
- // are used to create the client databases.
-
- if(!is_dir("$install_dir/server/lib")) {
- $command = "mkdir $install_dir/server/lib";
- caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- }
-
- $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mysql_clientdb.conf.master', "tpl/mysql_clientdb.conf.master");
- $content = str_replace('{hostname}', $conf['mysql']['host'], $content);
- $content = str_replace('{username}', $conf['mysql']['admin_user'], $content);
- $content = str_replace('{password}', $conf['mysql']['admin_password'], $content);
- wf("$install_dir/server/lib/mysql_clientdb.conf", $content);
- exec('chmod 600 '."$install_dir/server/lib/mysql_clientdb.conf");
- exec('chown root:root '."$install_dir/server/lib/mysql_clientdb.conf");
-
- }
-
- public function install_crontab()
- {
- global $conf;
-
- //* Root Crontab
- exec('crontab -u root -l > crontab.txt');
- $existing_root_cron_jobs = file('crontab.txt');
-
- // remove existing ispconfig cronjobs, in case the syntax has changed
- foreach($existing_root_cron_jobs as $key => $val) {
- if(stristr($val, '/usr/local/ispconfig')) unset($existing_root_cron_jobs[$key]);
- }
-
- $root_cron_jobs = array(
- '* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null',
- '30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
- );
-
- if ($conf['nginx']['installed'] == true) {
- $root_cron_jobs[] = "0 0 * * * /usr/local/ispconfig/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
- }
-
- foreach($root_cron_jobs as $cron_job) {
- if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
- $existing_root_cron_jobs[] = $cron_job."\n";
- }
- }
- file_put_contents('crontab.txt', $existing_root_cron_jobs);
- exec('crontab -u root crontab.txt &> /dev/null');
- unlink('crontab.txt');
-
- //* Getmail crontab
- if(is_user('getmail')) {
- $cf = $conf['getmail'];
- exec('crontab -u getmail -l > crontab.txt');
- $existing_cron_jobs = file('crontab.txt');
-
- $cron_jobs = array(
- '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /dev/null'
- );
-
- // remove existing ispconfig cronjobs, in case the syntax has changed
- foreach($existing_cron_jobs as $key => $val) {
- if(stristr($val, 'getmail')) unset($existing_cron_jobs[$key]);
- }
-
- foreach($cron_jobs as $cron_job) {
- if(!in_array($cron_job."\n", $existing_cron_jobs)) {
- $existing_cron_jobs[] = $cron_job."\n";
- }
- }
- file_put_contents('crontab.txt', $existing_cron_jobs);
- exec('crontab -u getmail crontab.txt &> /dev/null');
- unlink('crontab.txt');
- }
-
- exec('touch /var/log/ispconfig/cron.log');
- exec('chmod 660 /var/log/ispconfig/cron.log');
- }
-
}
?>
--
Gitblit v1.9.1