Skip to content

Commit 36420c6

Browse files
author
Marius Cramer
committed
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/sites/lib/lang/cz_web_subdomain.lng interface/web/sites/lib/lang/cz_web_subdomain_list.lng interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng server/cron_daily.php
2 parents 6a0c393 + 454fa04 commit 36420c6

File tree

348 files changed

+569
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+569
-643
lines changed

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,6 +1119,9 @@ public function install_ispconfig()
11191119
$command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
11201120
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
11211121
}
1122+
// add nobody user to www group, as the default php-fpm pool from opensuse runs as nobody
1123+
$command = 'usermod -a -G www nobody';
1124+
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
11221125
}
11231126

11241127
//* Make the shell scripts executable

‎install/lib/install.lib.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,20 +836,20 @@ function getapacheversion($get_minor = false) {
836836
if(is_installed('apache2ctl')) $cmd = 'apache2ctl -v';
837837
elseif(is_installed('apachectl')) $cmd = 'apachectl -v';
838838
else {
839-
$app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN);
839+
ilog("Could not check apache version, apachectl not found.");
840840
return '2.2';
841841
}
842842

843843
exec($cmd, $output, $return_var);
844844
if($return_var != 0 || !$output[0]) {
845-
$app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN);
845+
ilog("Could not check apache version, apachectl did not return any data.");
846846
return '2.2';
847847
}
848848

849849
if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
850850
return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : '');
851851
} else {
852-
$app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN);
852+
ilog("Could not check apache version, did not find version string in apachectl output.");
853853
return '2.2';
854854
}
855855
}
@@ -861,13 +861,13 @@ function getapachemodules() {
861861
if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
862862
elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
863863
else {
864-
$app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
864+
ilog("Could not check apache modules, apachectl not found.");
865865
return array();
866866
}
867867

868868
exec($cmd . ' 2>/dev/null', $output, $return_var);
869869
if($return_var != 0 || !$output[0]) {
870-
$app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN);
870+
ilog("Could not check apache modules, apachectl did not return any data.");
871871
return array();
872872
}
873873

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1629,7 +1629,8 @@ public function configure_apps_vhost() {
16291629
if(!is_user($apps_vhost_user)) caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
16301630

16311631

1632-
$command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
1632+
//$command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
1633+
$command = 'usermod -a -G '.$apps_vhost_group.' '.$conf['nginx']['user'];
16331634
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
16341635

16351636
if(!@is_dir($install_dir)){

‎install/sql/incremental/upd_0026.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
1+
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;

‎install/sql/incremental/upd_0042.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11

22
-- increase column size
3-
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT '';
3+
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;
44

‎install/sql/incremental/upd_0062.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ CREATE TABLE `mail_backup` (
1010
PRIMARY KEY (`backup_id`)
1111
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
1212

13-
ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL ;
13+
ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL DEFAULT 'none';
1414
ALTER TABLE `mail_user` ADD `backup_copies` INT NOT NULL DEFAULT '1';

‎install/sql/incremental/upd_0065.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;
22
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
3-
ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
4-
ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
3+
ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NULL AFTER `domain`;
4+
ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NULL AFTER `domain`;
55
ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;
66
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mysql','mongodb') NOT NULL DEFAULT 'web';
77
ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`;

‎install/sql/incremental/upd_0067.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ALTER TABLE `client`
2-
ADD `web_servers` blob NOT NULL DEFAULT '' AFTER `default_webserver`,
3-
ADD `mail_servers` blob NOT NULL DEFAULT '' AFTER `default_mailserver`,
4-
ADD `db_servers` blob NOT NULL DEFAULT '' AFTER `default_dbserver`,
5-
ADD `dns_servers` blob NOT NULL DEFAULT '' AFTER `default_dnsserver`;
2+
ADD `web_servers` blob NOT NULL AFTER `default_webserver`,
3+
ADD `mail_servers` blob NOT NULL AFTER `default_mailserver`,
4+
ADD `db_servers` blob NOT NULL AFTER `default_dbserver`,
5+
ADD `dns_servers` blob NOT NULL AFTER `default_dnsserver`;
66

77
UPDATE `client` SET `web_servers` = `default_webserver`, `mail_servers` = `default_mailserver`, `db_servers` = `default_dbserver`, `dns_servers` = `default_dnsserver` WHERE 1;

‎install/sql/ispconfig3.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ CREATE TABLE `client` (
169169
`bank_account_swift` varchar(255) DEFAULT NULL,
170170
`paypal_email` varchar(255) DEFAULT NULL,
171171
`default_mailserver` int(11) unsigned NOT NULL DEFAULT '1',
172-
`mail_servers` blob NOT NULL DEFAULT '',
172+
`mail_servers` blob NOT NULL,
173173
`limit_maildomain` int(11) NOT NULL DEFAULT '-1',
174174
`limit_mailbox` int(11) NOT NULL DEFAULT '-1',
175175
`limit_mailalias` int(11) NOT NULL DEFAULT '-1',
@@ -184,7 +184,7 @@ CREATE TABLE `client` (
184184
`limit_spamfilter_user` int(11) NOT NULL DEFAULT '0',
185185
`limit_spamfilter_policy` int(11) NOT NULL DEFAULT '0',
186186
`default_webserver` int(11) unsigned NOT NULL DEFAULT '1',
187-
`web_servers` blob NOT NULL DEFAULT '',
187+
`web_servers` blob NOT NULL,
188188
`limit_web_ip` text,
189189
`limit_web_domain` int(11) NOT NULL DEFAULT '-1',
190190
`limit_web_quota` int(11) NOT NULL DEFAULT '-1',
@@ -206,13 +206,13 @@ CREATE TABLE `client` (
206206
`limit_webdav_user` int(11) NOT NULL DEFAULT '0',
207207
`limit_aps` int(11) NOT NULL DEFAULT '-1',
208208
`default_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
209-
`db_servers` blob NOT NULL DEFAULT '',
209+
`db_servers` blob NOT NULL,
210210
`limit_dns_zone` int(11) NOT NULL DEFAULT '-1',
211211
`default_slave_dnsserver` int(11) unsigned NOT NULL DEFAULT '1',
212212
`limit_dns_slave_zone` int(11) NOT NULL DEFAULT '-1',
213213
`limit_dns_record` int(11) NOT NULL DEFAULT '-1',
214214
`default_dbserver` int(11) NOT NULL DEFAULT '1',
215-
`dns_servers` blob NOT NULL DEFAULT '',
215+
`dns_servers` blob NOT NULL,
216216
`limit_database` int(11) NOT NULL DEFAULT '-1',
217217
`limit_database_quota` int(11) NOT NULL default '-1',
218218
`limit_cron` int(11) NOT NULL DEFAULT '0',
@@ -740,8 +740,8 @@ CREATE TABLE `mail_domain` (
740740
`server_id` int(11) unsigned NOT NULL default '0',
741741
`domain` varchar(255) NOT NULL default '',
742742
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
743-
`dkim_private` mediumtext NOT NULL,
744-
`dkim_public` mediumtext NOT NULL,
743+
`dkim_private` mediumtext NULL,
744+
`dkim_public` mediumtext NULL,
745745
`active` enum('n','y') NOT NULL,
746746
PRIMARY KEY (`domain_id`),
747747
KEY `server_id` (`server_id`,`domain`),
@@ -918,7 +918,7 @@ CREATE TABLE `mail_user` (
918918
`disablelmtp` enum('n','y') NOT NULL default 'n',
919919
`disabledoveadm` enum('n','y') NOT NULL default 'n',
920920
`last_quota_notification` date NULL default NULL,
921-
`backup_interval` VARCHAR( 255 ) NOT NULL,
921+
`backup_interval` VARCHAR( 255 ) NOT NULL default 'none',
922922
`backup_copies` INT NOT NULL DEFAULT '1',
923923
PRIMARY KEY (`mailuser_id`),
924924
KEY `server_id` (`server_id`,`email`),

‎install/tpl/apache_apps.vhost.master‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<Directory {tmpl_var name='apps_vhost_dir'}>
3737
Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
3838
AllowOverride AuthConfig Indexes Limit Options FileInfo
39-
AddHandler fcgid-script .php
39+
<FilesMatch "\.php$">
40+
SetHandler fcgid-script
41+
</FilesMatch>
4042
FCGIWrapper {tmpl_var name='apps_vhost_basedir'}/php-fcgi-scripts/apps/.php-fcgi-starter .php
4143
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
4244
Require all granted

0 commit comments

Comments
 (0)