From efbb88feee52d96ca266485ea2e9d79ce54ff39a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 06 Jun 2014 10:41:28 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
install/dist/lib/opensuse.lib.php | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index a7dad5a..7ff56de 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -29,7 +29,23 @@
*/
class installer_dist extends installer_base {
-
+
+ public function __construct() {
+ //** check apache modules */
+ $mods = getapachemodules();
+ if(in_array('authz_compat', $mods, true)) {
+ swriteln($inst->lng(' WARNING! You are using mod_authz_compat.'));
+ swriteln($inst->lng(' Please make sure that your apache config uses the new auth syntax:'));
+ swriteln($inst->lng(' <Directory />'));
+ swriteln($inst->lng(' Options None'));
+ swriteln($inst->lng(' AllowOverride None'));
+ swriteln($inst->lng(' Require all denied'));
+ swriteln($inst->lng(' </Directory>'."\n"));
+
+ swriteln($inst->lng(' If it uses the old syntax (deny from all) ISPConfig would fail to work.'));
+ }
+ }
+
public function configure_mailman($status = 'insert') {
global $conf;
@@ -109,6 +125,7 @@
//* Create aliasaes
exec('/usr/lib/mailman/bin/genaliases 2>/dev/null');
+ if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman');
}
function configure_postfix($options = '')
@@ -427,7 +444,6 @@
'virtual_transport = dovecot',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
- 'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
@@ -485,7 +501,7 @@
exec("chown root:root $config_dir/$configfile");
// Dovecot shall ignore mounts in website directory
- exec("doveadm mount add '/srv/www/*' ignore");
+ if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
}
@@ -685,7 +701,7 @@
}
}
- $tpl->setLoop('ip_adresses',$ip_addresses);
+ if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);
wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());
unset($tpl);
@@ -1078,6 +1094,9 @@
$command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
+ // add nobody user to www group, as the default php-fpm pool from opensuse runs as nobody
+ $command = 'usermod -a -G www nobody';
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
//* Make the shell scripts executable
@@ -1116,7 +1135,9 @@
$tpl->setVar('apache_version',getapacheversion());
- wf($vhost_conf_dir.'/ispconfig.vhost', $tpl->grab());
+ $content = $tpl->grab();
+ $content = str_replace('/var/www/', '/srv/www/', $content);
+ wf($vhost_conf_dir.'/ispconfig.vhost', $content);
//if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');
@@ -1253,6 +1274,9 @@
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+
+ // Add symlink for patch tool
+ if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
}
--
Gitblit v1.9.1