Skip to content

Commit bd68aae

Browse files
author
Marius Cramer
committed
Resolved differences from svn merge to trunk and git master
1 parent 9b18966 commit bd68aae

File tree

289 files changed

+3234
-582
lines changed

Some content is hidden

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

289 files changed

+3234
-582
lines changed

‎install/autoupdate.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
//if(@is_dir('/etc/Bastille')) {
286286
//* Configure Firewall
287287
swriteln('Configuring Firewall');
288-
$inst->configure_firewall();
288+
$inst->configure_bastille_firewall();
289289
//}
290290

291291
//** Configure ISPConfig

‎install/install.php‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,17 @@
260260
$inst->configure_apps_vhost();
261261

262262
//* Configure Firewall
263-
//* Configure Bastille Firewall
264-
$conf['services']['firewall'] = true;
265-
swriteln('Configuring Bastille Firewall');
266-
$inst->configure_firewall();
263+
if($conf['ufw']['installed'] == true) {
264+
//* Configure Ubuntu Firewall
265+
$conf['services']['firewall'] = true;
266+
swriteln('Configuring Ubuntu Firewall');
267+
$inst->configure_ufw_firewall();
268+
} else {
269+
//* Configure Bastille Firewall
270+
$conf['services']['firewall'] = true;
271+
swriteln('Configuring Bastille Firewall');
272+
$inst->configure_bastille_firewall();
273+
}
267274

268275
//* Configure Fail2ban
269276
if($conf['fail2ban']['installed'] == true) {
@@ -331,7 +338,7 @@
331338
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
332339
//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
333340
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
334-
//if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
341+
if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
335342
}else{
336343

337344
//* In expert mode, we select the services in the following steps, only db is always available
@@ -547,18 +554,17 @@
547554

548555
//** Configure Firewall
549556
if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
550-
//if($conf['bastille']['installed'] == true) {
551-
//* Configure Bastille Firewall
552-
$conf['services']['firewall'] = true;
553-
swriteln('Configuring Bastille Firewall');
554-
$inst->configure_firewall();
555-
/*} elseif($conf['ufw']['installed'] == true) {
557+
if($conf['ufw']['installed'] == true) {
556558
//* Configure Ubuntu Firewall
557559
$conf['services']['firewall'] = true;
558560
swriteln('Configuring Ubuntu Firewall');
559561
$inst->configure_ufw_firewall();
562+
} else {
563+
//* Configure Bastille Firewall
564+
$conf['services']['firewall'] = true;
565+
swriteln('Configuring Bastille Firewall');
566+
$inst->configure_bastille_firewall();
560567
}
561-
*/
562568
}
563569

564570
//** Configure Firewall

‎install/lib/installer_base.lib.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function find_installed_apps() {
132132
if(is_installed('named') || is_installed('bind') || is_installed('bind9')) $conf['bind']['installed'] = true;
133133
if(is_installed('squid')) $conf['squid']['installed'] = true;
134134
if(is_installed('nginx')) $conf['nginx']['installed'] = true;
135-
// if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
135+
if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
136136
if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
137137
if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
138138
if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
@@ -1387,7 +1387,6 @@ public function configure_squid()
13871387
exec('chown root:root '.$conf["squid"]["config_dir"].'/'.$configfile);
13881388
}
13891389

1390-
/*
13911390
public function configure_ufw_firewall()
13921391
{
13931392
$configfile = 'ufw.conf';
@@ -1397,9 +1396,8 @@ public function configure_ufw_firewall()
13971396
exec('chmod 600 /etc/ufw/ufw.conf');
13981397
exec('chown root:root /etc/ufw/ufw.conf');
13991398
}
1400-
*/
14011399

1402-
public function configure_firewall() {
1400+
public function configure_bastille_firewall() {
14031401
global $conf;
14041402

14051403
$dist_init_scripts = $conf['init_scripts'];

‎install/sql/incremental/upd_0049.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
1+
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
2+
ALTER TABLE `web_backup` ADD `filesize` VARCHAR(10) NOT NULL AFTER `filename`;

‎install/sql/incremental/upd_0052.sql‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;
1+
ALTER TABLE `client_template` CHANGE `limit_aps` `limit_aps` INT( 11 ) NOT NULL DEFAULT '-1';
2+
ALTER TABLE `mail_domain` ADD `dkim_public` MEDIUMTEXT NOT NULL AFTER `domain`;
3+
ALTER TABLE `mail_domain` ADD `dkim_private` MEDIUMTEXT NOT NULL AFTER `domain`;
4+
ALTER TABLE `mail_domain` ADD `dkim` ENUM( 'n', 'y' ) NOT NULL AFTER `domain`;
5+
ALTER TABLE `client` ADD `default_slave_dnsserver` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1' AFTER `limit_dns_zone`;

‎install/sql/incremental/upd_0055.sql‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL;
1+
ALTER TABLE `web_backup` CHANGE `backup_type` `backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web';
2+
ALTER TABLE `web_database_user` ADD `database_password_mongo` varchar(32) DEFAULT NULL AFTER `database_password`;
3+
ALTER TABLE `sys_datalog` ADD `error` MEDIUMTEXT NULL DEFAULT NULL;

‎install/sql/incremental/upd_0058.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
ALTER TABLE `client` ADD COLUMN `can_use_api` enum('n','y') NOT NULL DEFAULT 'n' AFTER `canceled`;
22

33
ALTER TABLE `remote_session` ADD COLUMN `client_login` tinyint(1) unsigned NOT NULL default '0' AFTER `remote_functions`;
4+

‎install/sql/ispconfig3.sql‎

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ CREATE TABLE `client_template` (
267267
`sys_groupid` int(11) unsigned NOT NULL default '0',
268268
`sys_perm_user` varchar(5) default NULL,
269269
`sys_perm_group` varchar(5) default NULL,
270-
`sys_perm_other` varchar(5) default NULL,
270+
`sys_perm_other` varchar(5) default NULL,
271271
`template_name` varchar(64) NOT NULL,
272272
`template_type` varchar(1) NOT NULL default 'm',
273273
`limit_maildomain` int(11) NOT NULL default '-1',
@@ -682,6 +682,9 @@ CREATE TABLE `mail_domain` (
682682
`sys_perm_other` varchar(5) NOT NULL default '',
683683
`server_id` int(11) unsigned NOT NULL default '0',
684684
`domain` varchar(255) NOT NULL default '',
685+
`dkim` ENUM( 'n', 'y' ) NOT NULL default 'n',
686+
`dkim_private` mediumtext NOT NULL default '',
687+
`dkim_public` mediumtext NOT NULL default '',
685688
`active` enum('n','y') NOT NULL,
686689
PRIMARY KEY (`domain_id`),
687690
KEY `server_id` (`server_id`,`domain`),
@@ -1447,23 +1450,8 @@ CREATE TABLE IF NOT EXISTS `sys_cron` (
14471450
-- --------------------------------------------------------
14481451

14491452
--
1450-
-- Table structure for table `sys_cron`
1451-
--
1452-
1453-
CREATE TABLE IF NOT EXISTS `sys_cron` (
1454-
`name` varchar(50) NOT NULL,
1455-
`last_run` datetime NULL DEFAULT NULL,
1456-
`next_run` datetime NULL DEFAULT NULL,
1457-
`running` tinyint(1) UNSIGNED NOT NULL DEFAULT '0',
1458-
PRIMARY KEY (`name`)
1459-
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
1460-
1461-
1462-
-- --------------------------------------------------------
1463-
1464-
--
14651453
-- Table structure for table `sys_datalog`
1466-
--
1454+
--
14671455

14681456
CREATE TABLE `sys_datalog` (
14691457
`datalog_id` int(11) unsigned NOT NULL auto_increment,
@@ -1643,7 +1631,7 @@ CREATE TABLE `sys_user` (
16431631
`default_group` int(11) unsigned NOT NULL default '0',
16441632
`client_id` int(11) unsigned NOT NULL default '0',
16451633
`id_rsa` VARCHAR( 2000 ) NOT NULL default '',
1646-
`ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
1634+
`ssh_rsa` VARCHAR( 600 ) NOT NULL default '',
16471635
PRIMARY KEY (`userid`)
16481636
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
16491637

@@ -1680,10 +1668,11 @@ CREATE TABLE `web_backup` (
16801668
`backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
16811669
`server_id` int(10) unsigned NOT NULL,
16821670
`parent_domain_id` int(10) unsigned NOT NULL,
1683-
`backup_type` enum('web','mysql') NOT NULL DEFAULT 'web',
1671+
`backup_type` enum('web','mongodb','mysql') NOT NULL DEFAULT 'web',
16841672
`backup_mode` varchar(64) NOT NULL DEFAULT '',
16851673
`tstamp` int(10) unsigned NOT NULL,
16861674
`filename` varchar(255) NOT NULL,
1675+
`filesize` VARCHAR(10) NOT NULL,
16871676
PRIMARY KEY (`backup_id`)
16881677
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
16891678

@@ -1735,6 +1724,7 @@ CREATE TABLE IF NOT EXISTS `web_database_user` (
17351724
`database_user` varchar(64) DEFAULT NULL,
17361725
`database_user_prefix` varchar(50) NOT NULL default '',
17371726
`database_password` varchar(64) DEFAULT NULL,
1727+
`database_password_mongo` varchar(32) DEFAULT NULL,
17381728
PRIMARY KEY (`database_user_id`)
17391729
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
17401730

‎install/tpl/amavisd_user_config.master‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ $LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
7575
# Set the log_level to 5 for debugging
7676
$log_level = 0; # (defaults to 0)
7777

78+
# DKIM
79+
80+
$enable_dkim_verification = 1;
81+
$enable_dkim_signing = 1; # load DKIM signing code,
82+
@dkim_signature_options_bysender_maps = (
83+
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
7884

7985
#------------ Do not modify anything below this line -------------
8086
1; # insure a defined return

‎install/tpl/opensuse_amavisd_conf.master‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,5 +778,11 @@ $spam_admin = undef;
778778
$DO_SYSLOG = 1;
779779
$LOGFILE = "/var/log/amavis.log"; # (defaults to empty, no log)
780780

781+
# DKIM
782+
783+
$enable_dkim_verification = 1;
784+
$enable_dkim_signing = 1; # load DKIM signing code,
785+
@dkim_signature_options_bysender_maps = (
786+
{ '.' => { ttl => 21*24*3600, c => 'relaxed/simple' } } );
781787

782788
1; # insure a defined return

0 commit comments

Comments
 (0)