From 009b2dcf6ac4d6dabdb0ccec16319fa2901fbc48 Mon Sep 17 00:00:00 2001
From: Sergio Cambra <sergio@programatica.es>
Date: Tue, 08 Jul 2014 07:54:02 -0400
Subject: [PATCH] check reseller quota on mailbox edit
---
install/dist/lib/opensuse.lib.php | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index cc4a401..12c07b1 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;
@@ -440,7 +456,6 @@
'virtual_transport = lmtp:unix:private/dovecot-lmtp',
'smtpd_sasl_type = dovecot',
'smtpd_sasl_path = private/auth',
- 'receive_override_options = no_address_mappings'
);
// Make a backup copy of the main.cf file
@@ -498,7 +513,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");
}
@@ -1103,6 +1118,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
@@ -1280,6 +1298,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