From 03ade50f9f1826fbe3c21de9cc37fafb7aec8478 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Oct 2007 12:06:38 -0400
Subject: [PATCH] Minor fixes in the installer for Ubuntu 7.10

---
 install/sql/ispconfig3.sql |  332 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 240 insertions(+), 92 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index c80510d..04cb3c9 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` (
@@ -50,24 +50,32 @@
   `limit_spamfilter_wblist` int(11) NOT NULL default '0',
   `limit_spamfilter_user` int(11) NOT NULL default '0',
   `limit_spamfilter_policy` int(11) NOT NULL default '0',
-  `default_webserver` int(11) NOT NULL,
-  `limit_web_ip` text NOT NULL,
+  `default_webserver` int(11) NOT NULL default '1',
+  `limit_web_ip` text,
+  `limit_web_domain` int(11) NOT NULL default '-1',
+  `limit_web_subdomain` int(11) NOT NULL default '-1',
+  `limit_web_aliasdomain` int(11) NOT NULL default '-1',
+  `limit_ftp_user` int(11) NOT NULL default '-1',
+  `limit_shell_user` int(11) NOT NULL default '0',
+  `default_dnsserver` int(10) unsigned NOT NULL default '1',
+  `limit_dns_zone` int(11) NOT NULL default '-1',
+  `limit_dns_record` int(11) NOT NULL default '-1',
   `username` varchar(255) default NULL,
   `password` varchar(255) default NULL,
   `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` (
@@ -77,25 +85,22 @@
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
+  `server_id` int(11) NOT NULL default '1',
   `zone` int(10) unsigned NOT NULL,
   `name` char(64) NOT NULL,
-  `type` enum('A','AAAA','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
+  `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
   `data` char(128) NOT NULL,
-  `aux` int(10) unsigned NOT NULL,
+  `aux` int(10) unsigned NOT NULL default '0',
   `ttl` int(10) unsigned NOT NULL default '86400',
+  `active` enum('N','Y') NOT NULL default 'Y',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 ;
-
--- 
--- Daten für Tabelle `dns_rr`
--- 
-
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
 -- 
--- Tabellenstruktur für Tabelle `dns_soa`
+-- Tabellenstruktur f�r Tabelle `dns_soa`
 -- 
 
 CREATE TABLE `dns_soa` (
@@ -105,6 +110,7 @@
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
+  `server_id` int(11) NOT NULL default '1',
   `origin` char(255) NOT NULL,
   `ns` char(255) NOT NULL,
   `mbox` char(255) NOT NULL,
@@ -119,17 +125,14 @@
   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`
--- 
 
 
 -- --------------------------------------------------------
 
 -- 
--- Tabellenstruktur für Tabelle `ftp_user`
+-- Tabellenstruktur f�r Tabelle `ftp_user`
 -- 
 
 CREATE TABLE `ftp_user` (
@@ -145,8 +148,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 +157,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 +184,39 @@
   `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_content_filter`
+-- 
+
+CREATE TABLE `mail_content_filter` (
+  `content_filter_id` bigint(20) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_other` varchar(5) default NULL,
+  `server_id` int(11) NOT NULL default '0',
+  `type` varchar(255) default NULL,
+  `pattern` varchar(255) default NULL,
+  `data` varchar(255) default NULL,
+  `action` varchar(255) default NULL,
+  `active` varchar(255) NOT NULL default 'y',
+  PRIMARY KEY  (`content_filter_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur f�r Tabelle `mail_domain`
 -- 
 
 CREATE TABLE `mail_domain` (
@@ -206,17 +231,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 +258,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 +287,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 +309,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 +331,36 @@
   `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_traffic`
+-- 
+
+CREATE TABLE `mail_traffic` (
+  `traffic_id` int(10) unsigned NOT NULL auto_increment,
+  `mailuser_id` int(10) unsigned NOT NULL,
+  `month` char(7) NOT NULL,
+  `traffic` bigint(20) unsigned NOT NULL,
+  PRIMARY KEY  (`traffic_id`),
+  KEY `mailuser_id` (`mailuser_id`,`month`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten f�r Tabelle `mail_traffic`
 -- 
 
 
 -- --------------------------------------------------------
 
 -- 
--- Tabellenstruktur für Tabelle `mail_transport`
+-- Tabellenstruktur f�r Tabelle `mail_transport`
 -- 
 
 CREATE TABLE `mail_transport` (
@@ -334,15 +378,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 +414,57 @@
   `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 `remote_session`
+-- 
+
+CREATE TABLE `remote_session` (
+  `remote_session` varchar(50) NOT NULL,
+  `remote_userid` int(11) NOT NULL,
+  `remote_functions` text NOT NULL,
+  `tstamp` int(10) unsigned NOT NULL,
+  PRIMARY KEY  (`remote_session`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+-- 
+-- Daten f�r Tabelle `remote_session`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur f�r Tabelle `remote_user`
+-- 
+
+CREATE TABLE `remote_user` (
+  `remote_userid` int(11) NOT NULL auto_increment,
+  `remote_username` varchar(255) NOT NULL,
+  `remote_password` varchar(255) NOT NULL,
+  `remote_functions` text NOT NULL,
+  PRIMARY KEY  (`remote_userid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten f�r Tabelle `remote_user`
+-- 
+
+
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur f�r Tabelle `server`
 -- 
 
 CREATE TABLE `server` (
@@ -398,16 +485,19 @@
   `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[server]\nip_address=192.168.0.105\nnetmask=255.255.255.0\ngateway=192.168.0.1\nhostname=server1.example.com\nnameservers=193.174.32.18,145.253.2.75\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\nrelayhost=\nrelayhost_user=\nrelayhost_password=\nmailbox_size_limit=0\nmessage_size_limit=0\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` (
@@ -421,16 +511,44 @@
   `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`
 -- 
 
 -- --------------------------------------------------------
 
+
+CREATE TABLE `shell_user` (
+  `shell_user_id` bigint(20) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_other` varchar(5) default NULL,
+  `server_id` int(11) NOT NULL default '0',
+  `parent_domain_id` int(11) NOT NULL default '0',
+  `username` varchar(255) default NULL,
+  `password` varchar(255) default NULL,
+  `quota_size` int(11) NOT NULL default '-1',
+  `active` varchar(255) NOT NULL default 'y',
+  `puser` varchar(255) default NULL,
+  `pgroup` varchar(255) default NULL,
+  `shell` varchar(255) NOT NULL default '/bin/bash',
+  `dir` varchar(255) default NULL,
+  PRIMARY KEY  (`shell_user_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
 -- 
--- Tabellenstruktur für Tabelle `spamfilter_policy`
+-- Daten f�r Tabelle `shell_user`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur f�r Tabelle `spamfilter_policy`
 -- 
 
 CREATE TABLE `spamfilter_policy` (
@@ -478,10 +596,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);
@@ -491,15 +609,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` (
@@ -517,16 +631,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` (
@@ -543,16 +658,38 @@
   `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 `support_message`
+-- 
+
+CREATE TABLE `support_message` (
+  `support_message_id` bigint(20) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_other` varchar(5) default NULL,
+  `recipient_id` int(11) NOT NULL default '0',
+  `sender_id` int(11) NOT NULL default '0',
+  `subject` varchar(255) default NULL,
+  `message` varchar(255) default NULL,
+  `tstamp` int(11) NOT NULL default '1187707778',
+  PRIMARY KEY  (`support_message_id`)
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur f�r Tabelle `sys_datalog`
 -- 
 
 CREATE TABLE `sys_datalog` (
@@ -565,16 +702,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` (
@@ -593,17 +731,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` (
@@ -618,17 +756,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` (
@@ -637,19 +775,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` (
@@ -671,18 +808,18 @@
   `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);
+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,dns', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
 
 -- --------------------------------------------------------
 
 -- 
--- Tabellenstruktur für Tabelle `web_domain`
+-- Tabellenstruktur f�r Tabelle `web_domain`
 -- 
 
 CREATE TABLE `web_domain` (
@@ -703,16 +840,27 @@
   `system_group` varchar(255) default NULL,
   `hd_quota` int(11) NOT NULL default '0',
   `traffic_quota` int(11) NOT NULL default '0',
-  `cgi` varchar(255) NOT NULL default 'y',
-  `ssi` varchar(255) NOT NULL default 'y',
-  `suexec` varchar(255) NOT NULL default 'y',
+  `cgi` char(1) NOT NULL default 'y',
+  `ssi` char(1) NOT NULL default 'y',
+  `suexec` char(1) 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,
+  `ssl` enum('n','y') NOT NULL default 'n',
+  `ssl_state` varchar(255) NOT NULL,
+  `ssl_locality` varchar(255) NOT NULL,
+  `ssl_organisation` varchar(255) NOT NULL,
+  `ssl_organisation_unit` varchar(255) NOT NULL,
+  `ssl_country` varchar(255) NOT NULL,
+  `ssl_request` mediumtext NOT NULL,
+  `ssl_cert` mediumtext NOT NULL,
+  `ssl_bundle` mediumtext NOT NULL,
+  `ssl_action` varchar(10) NOT 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`
 -- 

--
Gitblit v1.9.1