Skip to content

Commit 3edf9d7

Browse files
tbrehmtbrehm
committed
updated installer and sql dump.
1 parent ba747c0 commit 3edf9d7

File tree

4 files changed

+57
-27
lines changed

4 files changed

+57
-27
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,10 @@ function configure_spamassassin() {
442442
function configure_getmail() {
443443
global $conf;
444444

445-
$command = "useradd -b /etc/getmail -d /etc/getmail getmail";
445+
$command = "useradd -d /etc/getmail getmail";
446+
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
447+
448+
$command = "chown -R getmail /etc/getmail";
446449
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
447450

448451
$command = "chmod -R 700 /etc/getmail";

‎install/sql/ispconfig3.sql‎

Lines changed: 51 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
-- http://www.phpmyadmin.net
44
--
55
-- Host: localhost
6-
-- Erstellungszeit: 26. Mai 2007 um 18:33
6+
-- Erstellungszeit: 30. Mai 2007 um 16:57
77
-- Server Version: 5.0.24
88
-- PHP-Version: 5.1.4
99
--
@@ -55,7 +55,7 @@ CREATE TABLE `client` (
5555
`language` varchar(255) NOT NULL default 'en',
5656
`usertheme` varchar(255) NOT NULL default 'default',
5757
PRIMARY KEY (`client_id`)
58-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=5 ;
58+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
5959

6060
--
6161
-- Daten für Tabelle `client`
@@ -82,7 +82,7 @@ CREATE TABLE `dns_rr` (
8282
`ttl` int(10) unsigned NOT NULL default '86400',
8383
PRIMARY KEY (`id`),
8484
UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
85-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
85+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
8686

8787
--
8888
-- Daten für Tabelle `dns_rr`
@@ -116,7 +116,7 @@ CREATE TABLE `dns_soa` (
116116
PRIMARY KEY (`id`),
117117
UNIQUE KEY `origin` (`origin`),
118118
KEY `active` (`active`)
119-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
119+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
120120

121121
--
122122
-- Daten für Tabelle `dns_soa`
@@ -143,12 +143,11 @@ CREATE TABLE `mail_access` (
143143
`active` enum('n','y') NOT NULL default 'y',
144144
PRIMARY KEY (`access_id`),
145145
KEY `server_id` (`server_id`,`source`)
146-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=5 ;
146+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
147147

148148
--
149149
-- Daten für Tabelle `mail_access`
150150
--
151-
152151
-- --------------------------------------------------------
153152

154153
--
@@ -167,13 +166,12 @@ CREATE TABLE `mail_domain` (
167166
`active` enum('y','n') NOT NULL,
168167
PRIMARY KEY (`domain_id`),
169168
KEY `server_id` (`server_id`,`domain`)
170-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
169+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
171170

172171
--
173172
-- Daten für Tabelle `mail_domain`
174173
--
175174

176-
177175
-- --------------------------------------------------------
178176

179177
--
@@ -194,14 +192,42 @@ CREATE TABLE `mail_forwarding` (
194192
`active` enum('y','n') NOT NULL,
195193
PRIMARY KEY (`forwarding_id`),
196194
KEY `server_id` (`server_id`,`source`)
197-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
195+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
198196

199197
--
200198
-- Daten für Tabelle `mail_forwarding`
201199
--
202200

203201
-- --------------------------------------------------------
204202

203+
--
204+
-- Tabellenstruktur für Tabelle `mail_get`
205+
--
206+
207+
CREATE TABLE `mail_get` (
208+
`mailget_id` bigint(20) NOT NULL auto_increment,
209+
`sys_userid` int(11) NOT NULL default '0',
210+
`sys_groupid` int(11) NOT NULL default '0',
211+
`sys_perm_user` varchar(5) default NULL,
212+
`sys_perm_group` varchar(5) default NULL,
213+
`sys_perm_other` varchar(5) default NULL,
214+
`server_id` int(11) NOT NULL default '0',
215+
`type` varchar(255) default NULL,
216+
`source_server` varchar(255) default NULL,
217+
`source_username` varchar(255) default NULL,
218+
`source_password` varchar(255) default NULL,
219+
`source_delete` varchar(255) NOT NULL default 'y',
220+
`destination` varchar(255) default NULL,
221+
`active` varchar(255) NOT NULL default 'y',
222+
PRIMARY KEY (`mailget_id`)
223+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
224+
225+
--
226+
-- Daten für Tabelle `mail_get`
227+
--
228+
229+
-- --------------------------------------------------------
230+
205231
--
206232
-- Tabellenstruktur für Tabelle `mail_greylist`
207233
--
@@ -265,7 +291,7 @@ CREATE TABLE `mail_transport` (
265291
PRIMARY KEY (`transport_id`),
266292
KEY `server_id` (`server_id`,`transport`),
267293
KEY `server_id_2` (`server_id`,`domain`)
268-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
294+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
269295

270296
--
271297
-- Daten für Tabelle `mail_transport`
@@ -299,7 +325,7 @@ CREATE TABLE `mail_user` (
299325
`access` enum('y','n') NOT NULL,
300326
PRIMARY KEY (`mailuser_id`),
301327
KEY `server_id` (`server_id`,`email`)
302-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
328+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
303329

304330
--
305331
-- Daten für Tabelle `mail_user`
@@ -329,13 +355,13 @@ CREATE TABLE `server` (
329355
`updated` tinyint(4) NOT NULL default '0',
330356
`active` tinyint(4) NOT NULL default '1',
331357
PRIMARY KEY (`server_id`)
332-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
358+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
333359

334360
--
335361
-- Daten für Tabelle `server`
336362
--
337363

338-
INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 1, 'riud', 'riud', 'r', 'Server 1', 1, 1, 1, 1, 1, 1, '[global]\r\nwebserver=apache\r\nmailserver=exim\r\ndnsserver=mydns\r\n\r\n[mail]\r\nmodule=postfix_mysql\r\nmaildir_path=/home/vmail/[domain]/[localpart]/\r\nhomedir_path=/home/vmail/\r\nmailuser_uid=5000\r\nmailuser_gid=5000', 0, 1);
364+
INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `db_server`, `vserver_server`, `config`, `updated`, `active`) VALUES (1, 1, 1, 'riud', 'riud', 'r', 'Server 1', 1, 1, 1, 1, 1, 1, '[global]\nwebserver=apache\nmailserver=postfix\ndnsserver=mydns\n\n[mail]\nmodule=postfix_mysql\nmaildir_path=/home/vmail/[domain]/[localpart]/\nhomedir_path=/home/vmail/\nmailuser_uid=5000\nmailuser_gid=5000\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n', 0, 1);
339365

340366
-- --------------------------------------------------------
341367

@@ -388,7 +414,7 @@ CREATE TABLE `spamfilter_policy` (
388414
`message_size_limit` int(11) default NULL,
389415
`banned_rulenames` varchar(64) default NULL,
390416
PRIMARY KEY (`id`)
391-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ;
417+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
392418

393419
--
394420
-- Daten für Tabelle `spamfilter_policy`
@@ -405,7 +431,6 @@ INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
405431
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (9, 1, 0, 'riud', 'riud', '', 'userB', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.3, 6.3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
406432
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (10, 1, 0, 'riud', 'riud', '', 'userC', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6, 6, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
407433
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (11, 1, 0, 'riud', 'riud', '', 'userD', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 7, 7, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
408-
INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (12, 1, 0, 'riud', 'riud', '', 'test', 'Y', 'Y', 'N', 'N', 'N', NULL, 'N', 'N', 'N', '', '', '', '', '', '', 0.7, 0, 0, 0, 0, '', '', '', '', 'N', 'N', 'N', '', '', '', '', '', '', '', 0, '');
409434

410435
-- --------------------------------------------------------
411436

@@ -428,7 +453,7 @@ CREATE TABLE `spamfilter_users` (
428453
`local` char(1) default NULL,
429454
PRIMARY KEY (`id`),
430455
UNIQUE KEY `email` (`email`)
431-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=21 ;
456+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
432457

433458
--
434459
-- Daten für Tabelle `spamfilter_users`
@@ -454,34 +479,35 @@ CREATE TABLE `spamfilter_wblist` (
454479
`priority` int(11) NOT NULL,
455480
`active` enum('y','n') NOT NULL default 'y',
456481
PRIMARY KEY (`wblist_id`)
457-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
482+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
458483

459484
--
460485
-- Daten für Tabelle `spamfilter_wblist`
461486
--
462487

463488
-- --------------------------------------------------------
464489

490+
465491
--
466492
-- Tabellenstruktur für Tabelle `sys_datalog`
467493
--
468494

469495
CREATE TABLE `sys_datalog` (
470496
`datalog_id` bigint(20) NOT NULL auto_increment,
497+
`server_id` int(11) NOT NULL,
471498
`dbtable` varchar(255) NOT NULL default '',
472499
`dbidx` varchar(255) NOT NULL default '',
473500
`action` char(1) NOT NULL default '',
474501
`tstamp` bigint(20) NOT NULL default '0',
475502
`user` varchar(255) NOT NULL default '',
476503
`data` text NOT NULL,
477504
PRIMARY KEY (`datalog_id`)
478-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=35 ;
505+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
479506

480507
--
481508
-- Daten für Tabelle `sys_datalog`
482509
--
483510

484-
485511
-- --------------------------------------------------------
486512

487513
--
@@ -504,7 +530,7 @@ CREATE TABLE `sys_dbsync` (
504530
`last_datalog_id` bigint(20) NOT NULL default '0',
505531
PRIMARY KEY (`id`),
506532
KEY `last_datalog_id` (`last_datalog_id`)
507-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
533+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
508534

509535
--
510536
-- Daten für Tabelle `sys_dbsync`
@@ -529,7 +555,7 @@ CREATE TABLE `sys_filesync` (
529555
`wput_options` varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
530556
`active` int(11) NOT NULL default '1',
531557
PRIMARY KEY (`id`)
532-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
558+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
533559

534560
--
535561
-- Daten für Tabelle `sys_filesync`
@@ -548,7 +574,7 @@ CREATE TABLE `sys_group` (
548574
`description` text NOT NULL,
549575
`client_id` int(11) NOT NULL default '0',
550576
PRIMARY KEY (`groupid`)
551-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
577+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
552578

553579
--
554580
-- Daten für Tabelle `sys_group`
@@ -557,6 +583,7 @@ CREATE TABLE `sys_group` (
557583
INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0);
558584
INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (2, 'user', 'Users Group', 0);
559585

586+
560587
-- --------------------------------------------------------
561588

562589
--
@@ -582,10 +609,10 @@ CREATE TABLE `sys_user` (
582609
`default_group` int(11) NOT NULL default '0',
583610
`client_id` int(11) NOT NULL default '0',
584611
PRIMARY KEY (`userid`)
585-
) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
612+
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
586613

587614
--
588615
-- Daten für Tabelle `sys_user`
589616
--
590617

591-
INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,designer,mail', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
618+
INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);

‎install/uninstall.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
require("/usr/local/ispconfig/server/lib/app.inc.php");
3333

3434
// Delete the ISPConfig database
35-
$app->db->query('DROP DATABASE '.$conf["db_database"]);
35+
$app->db->query("DROP DATABASE '".$conf["db_database"]."'");
3636

3737
// Deleting the symlink in /var/www
3838
unlink("/var/www/ispconfig");

‎interface/web/mail/form/mail_user.tform.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
'access' => array (
141141
'datatype' => 'VARCHAR',
142142
'formtype' => 'CHECKBOX',
143-
'default' => '1',
143+
'default' => 'y',
144144
'value' => array(1 => 'y',0 => 'n')
145145
),
146146
##################################

0 commit comments

Comments
 (0)