From c58e3f77c9c019ea1f47705bee01d63055df85c5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 29 Jun 2007 10:45:59 -0400
Subject: [PATCH] updated installer and sql dump
---
install/lib/installer_base.lib.php | 15 ++--
install/sql/ispconfig3.sql | 160 +++++++++++++++++++++++++++--------------------------
install/update.php | 2
3 files changed, 90 insertions(+), 87 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index f97c4b4..c711dcf 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -104,7 +104,7 @@
Create postfix configuration files
*/
- function configure_postfix() {
+ function configure_postfix($options = '';) {
global $conf;
if(!is_dir($conf["dist_postfix_config_dir"])) $this->error("The postfix configuration directory ".$conf["dist_postfix_config_dir"]." does not exist.");
@@ -248,13 +248,14 @@
flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
*/
+ if(stristr($options,'dont-create-certs') {
+ // Create the SSL certificate
+ $command = "cd ".$conf["dist_postfix_config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
+ exec($command);
- // Create the SSL certificate
- $command = "cd ".$conf["dist_postfix_config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
- exec($command);
-
- $command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
- caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+ $command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
+ caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
+ }
/*
We have to change the permissions of the courier authdaemon directory
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 1e552be..1c5ad5c 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -3,7 +3,7 @@
-- http://www.phpmyadmin.net
--
-- Host: localhost
--- Erstellungszeit: 26. Juni 2007 um 13:47
+-- Erstellungszeit: 29. Juni 2007 um 16:37
-- Server Version: 5.0.24
-- PHP-Version: 5.1.4
--
@@ -13,7 +13,7 @@
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `client`
+-- Tabellenstruktur f�r Tabelle `client`
--
CREATE TABLE `client` (
@@ -57,17 +57,17 @@
`language` varchar(255) NOT NULL default 'en',
`usertheme` varchar(255) NOT NULL default 'default',
PRIMARY KEY (`client_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `client`
+-- Daten f�r Tabelle `client`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `dns_rr`
+-- Tabellenstruktur f�r Tabelle `dns_rr`
--
CREATE TABLE `dns_rr` (
@@ -85,17 +85,17 @@
`ttl` int(10) unsigned NOT NULL default '86400',
PRIMARY KEY (`id`),
UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `dns_rr`
+-- Daten f�r Tabelle `dns_rr`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `dns_soa`
+-- Tabellenstruktur f�r Tabelle `dns_soa`
--
CREATE TABLE `dns_soa` (
@@ -119,17 +119,17 @@
PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `dns_soa`
+-- Daten f�r Tabelle `dns_soa`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `ftp_user`
+-- Tabellenstruktur f�r Tabelle `ftp_user`
--
CREATE TABLE `ftp_user` (
@@ -145,8 +145,8 @@
`password` varchar(255) default NULL,
`quota_size` int(11) NOT NULL default '-1',
`active` varchar(255) NOT NULL default 'y',
- `uid` int(11) NOT NULL default '0',
- `gid` int(11) NOT NULL default '0',
+ `uid` varchar(255) default NULL,
+ `gid` varchar(255) default NULL,
`dir` varchar(255) default NULL,
`quota_files` int(11) NOT NULL default '-1',
`ul_ratio` int(11) NOT NULL default '-1',
@@ -154,17 +154,17 @@
`ul_bandwidth` int(11) NOT NULL default '-1',
`dl_bandwidth` int(11) NOT NULL default '-1',
PRIMARY KEY (`ftp_user_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `ftp_user`
+-- Daten f�r Tabelle `ftp_user`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_access`
+-- Tabellenstruktur f�r Tabelle `mail_access`
--
CREATE TABLE `mail_access` (
@@ -181,17 +181,17 @@
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`access_id`),
KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_access`
+-- Daten f�r Tabelle `mail_access`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_domain`
+-- Tabellenstruktur f�r Tabelle `mail_domain`
--
CREATE TABLE `mail_domain` (
@@ -206,17 +206,17 @@
`active` enum('y','n') NOT NULL,
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_domain`
+-- Daten f�r Tabelle `mail_domain`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_forwarding`
+-- Tabellenstruktur f�r Tabelle `mail_forwarding`
--
CREATE TABLE `mail_forwarding` (
@@ -233,17 +233,17 @@
`active` enum('y','n') NOT NULL,
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_forwarding`
+-- Daten f�r Tabelle `mail_forwarding`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_get`
+-- Tabellenstruktur f�r Tabelle `mail_get`
--
CREATE TABLE `mail_get` (
@@ -262,17 +262,17 @@
`destination` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`mailget_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_get`
+-- Daten f�r Tabelle `mail_get`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_greylist`
+-- Tabellenstruktur f�r Tabelle `mail_greylist`
--
CREATE TABLE `mail_greylist` (
@@ -284,17 +284,17 @@
`origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
`create_time` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`greylist_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_greylist`
+-- Daten f�r Tabelle `mail_greylist`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_mailman_domain`
+-- Tabellenstruktur f�r Tabelle `mail_mailman_domain`
--
CREATE TABLE `mail_mailman_domain` (
@@ -306,17 +306,17 @@
`mm_user` varchar(50) NOT NULL default '',
`mm_group` varchar(50) NOT NULL default '',
PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_mailman_domain`
+-- Daten f�r Tabelle `mail_mailman_domain`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_transport`
+-- Tabellenstruktur f�r Tabelle `mail_transport`
--
CREATE TABLE `mail_transport` (
@@ -334,15 +334,17 @@
PRIMARY KEY (`transport_id`),
KEY `server_id` (`server_id`,`transport`),
KEY `server_id_2` (`server_id`,`domain`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_transport`
+-- Daten f�r Tabelle `mail_transport`
--
+
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `mail_user`
+-- Tabellenstruktur f�r Tabelle `mail_user`
--
CREATE TABLE `mail_user` (
@@ -368,16 +370,17 @@
`access` enum('y','n') NOT NULL,
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `mail_user`
+-- Daten f�r Tabelle `mail_user`
--
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `server`
+-- Tabellenstruktur f�r Tabelle `server`
--
CREATE TABLE `server` (
@@ -398,18 +401,18 @@
`updated` tinyint(4) NOT NULL default '0',
`active` tinyint(4) NOT NULL default '1',
PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
--
--- Daten für Tabelle `server`
+-- Daten f�r Tabelle `server`
--
-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\nmailuser_name=vmail\nmailuser_group=vmail\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n\n[web]\nwebsite_path=/var/clients/client[client_id]/web[website_id]\nwebsite_symlinks=/var/www/[website_domain]/:/var/clients/client[client_id]/[website_domain]/\n\n', 0, 1);
+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\nmailuser_name=vmail\nmailuser_group=vmail\n\n[getmail]\ngetmail_config_dir=/etc/getmail\n\n[web]\nwebsite_path=/var/clients/client[client_id]/web[website_id]\nwebsite_symlinks=/var/www/[website_domain]/:/var/clients/client[client_id]/[website_domain]/\nvhost_conf_dir=/etc/apache2/sites-available\nvhost_conf_enabled_dir=/etc/apache2/sites-enabled\n\n', 0, 1);
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `server_ip`
+-- Tabellenstruktur f�r Tabelle `server_ip`
--
CREATE TABLE `server_ip` (
@@ -423,16 +426,17 @@
`ip_address` varchar(15) default NULL,
`virtualhost` char(1) NOT NULL default 'y',
PRIMARY KEY (`server_ip_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `server_ip`
+-- Daten f�r Tabelle `server_ip`
--
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `spamfilter_policy`
+-- Tabellenstruktur f�r Tabelle `spamfilter_policy`
--
CREATE TABLE `spamfilter_policy` (
@@ -480,10 +484,10 @@
`message_size_limit` int(11) default NULL,
`banned_rulenames` varchar(64) default NULL,
PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ;
--
--- Daten für Tabelle `spamfilter_policy`
+-- Daten f�r Tabelle `spamfilter_policy`
--
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 (1, 1, 0, 'riud', 'riud', '', 'Non-paying', 'N', 'N', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'Y', '', '', '', '', '', '', 3, 7, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -493,15 +497,11 @@
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 (5, 1, 0, 'riud', 'riud', '', 'Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
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 (6, 1, 0, 'riud', 'riud', '', 'Trigger happy', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 5, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
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 (7, 1, 0, 'riud', 'riud', '', 'Permissive', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 10, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-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 (8, 1, 0, 'riud', 'riud', '', '6.5/7.8', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.5, 7.8, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-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);
-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);
-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);
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `spamfilter_users`
+-- Tabellenstruktur f�r Tabelle `spamfilter_users`
--
CREATE TABLE `spamfilter_users` (
@@ -519,16 +519,17 @@
`local` char(1) default NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `email` (`email`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `spamfilter_users`
+-- Daten f�r Tabelle `spamfilter_users`
--
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `spamfilter_wblist`
+-- Tabellenstruktur f�r Tabelle `spamfilter_wblist`
--
CREATE TABLE `spamfilter_wblist` (
@@ -545,16 +546,17 @@
`priority` int(11) NOT NULL,
`active` enum('y','n') NOT NULL default 'y',
PRIMARY KEY (`wblist_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `spamfilter_wblist`
+-- Daten f�r Tabelle `spamfilter_wblist`
--
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `sys_datalog`
+-- Tabellenstruktur f�r Tabelle `sys_datalog`
--
CREATE TABLE `sys_datalog` (
@@ -567,16 +569,17 @@
`user` varchar(255) NOT NULL default '',
`data` text NOT NULL,
PRIMARY KEY (`datalog_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `sys_datalog`
+-- Daten f�r Tabelle `sys_datalog`
--
+
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `sys_dbsync`
+-- Tabellenstruktur f�r Tabelle `sys_dbsync`
--
CREATE TABLE `sys_dbsync` (
@@ -595,17 +598,17 @@
`last_datalog_id` bigint(20) NOT NULL default '0',
PRIMARY KEY (`id`),
KEY `last_datalog_id` (`last_datalog_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `sys_dbsync`
+-- Daten f�r Tabelle `sys_dbsync`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `sys_filesync`
+-- Tabellenstruktur f�r Tabelle `sys_filesync`
--
CREATE TABLE `sys_filesync` (
@@ -620,17 +623,17 @@
`wput_options` varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
`active` int(11) NOT NULL default '1',
PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `sys_filesync`
+-- Daten f�r Tabelle `sys_filesync`
--
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `sys_group`
+-- Tabellenstruktur f�r Tabelle `sys_group`
--
CREATE TABLE `sys_group` (
@@ -639,19 +642,18 @@
`description` text NOT NULL,
`client_id` int(11) NOT NULL default '0',
PRIMARY KEY (`groupid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
--
--- Daten für Tabelle `sys_group`
+-- Daten f�r Tabelle `sys_group`
--
INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0);
-INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (2, 'user', 'Users Group', 0);
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `sys_user`
+-- Tabellenstruktur f�r Tabelle `sys_user`
--
CREATE TABLE `sys_user` (
@@ -673,10 +675,10 @@
`default_group` int(11) NOT NULL default '0',
`client_id` int(11) NOT NULL default '0',
PRIMARY KEY (`userid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
--
--- Daten für Tabelle `sys_user`
+-- Daten f�r Tabelle `sys_user`
--
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,monitor,sites', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
@@ -684,7 +686,7 @@
-- --------------------------------------------------------
--
--- Tabellenstruktur für Tabelle `web_domain`
+-- Tabellenstruktur f�r Tabelle `web_domain`
--
CREATE TABLE `web_domain` (
@@ -709,12 +711,12 @@
`ssi` varchar(255) NOT NULL default 'y',
`suexec` varchar(255) NOT NULL default 'y',
`php` varchar(255) NOT NULL default 'y',
- `redirect_type` varchar(255) NOT NULL default 'y',
+ `redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
--
--- Daten für Tabelle `web_domain`
+-- Daten f�r Tabelle `web_domain`
--
diff --git a/install/update.php b/install/update.php
index 0dc7919..394ab9b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -91,7 +91,7 @@
exec("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_ispconfig_user] -p$conf[mysql_server_ispconfig_password] $conf[mysql_server_database] < existing_db.sql &> /dev/null");
// Configure postfix
-$inst->configure_postfix();
+$inst->configure_postfix('dont-create-certs');
// Configure saslauthd
swriteln('Configuring SASL');
--
Gitblit v1.9.1