From d5cf65e7d10bc3ee03ce2cef0cdb2b4d72404c69 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Sun, 19 Aug 2007 20:57:07 -0400
Subject: [PATCH] Minor interface tidyup
---
interface/sql/ispconfig3db.sql | 384 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 276 insertions(+), 108 deletions(-)
diff --git a/interface/sql/ispconfig3db.sql b/interface/sql/ispconfig3db.sql
index 887ce2e..1b79ac7 100644
--- a/interface/sql/ispconfig3db.sql
+++ b/interface/sql/ispconfig3db.sql
@@ -3,102 +3,53 @@
# http://www.phpmyadmin.net/ (download page)
#
# Host: localhost
-# Erstellungszeit: 01. November 2005 um 23:57
+# Erstellungszeit: 24. Februar 2006 um 10:32
# Server Version: 4.0.23
# PHP-Version: 5.0.3
# Datenbank: `ispconfig3`
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `mail_blacklist`
+# Tabellenstruktur f�r Tabelle `mail_blacklist`
#
DROP TABLE IF EXISTS mail_blacklist;
CREATE TABLE mail_blacklist (
blacklist_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
server_id int(11) NOT NULL default '0',
- address varchar(255) NOT NULL default '',
+ address varchar(200) NOT NULL default '',
+ recipient varchar(200) NOT NULL default '',
+ active enum('0','1') NOT NULL default '1',
PRIMARY KEY (blacklist_id),
- KEY server_id (server_id,address)
+ KEY server_id (server_id,address,recipient)
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `mail_blacklist`
+# Daten f�r Tabelle `mail_blacklist`
#
+INSERT INTO mail_blacklist VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till@test.int', 'till@test.int', '0');
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `mail_domain`
+# Tabellenstruktur f�r Tabelle `mail_box`
#
-DROP TABLE IF EXISTS mail_domain;
-CREATE TABLE mail_domain (
- domain_id int(11) NOT NULL auto_increment,
- server_id int(11) NOT NULL default '0',
- domain varchar(255) NOT NULL default '',
- type enum('local','relay','manual_relay') NOT NULL default 'local',
- relay_host varchar(255) NOT NULL default '',
- PRIMARY KEY (domain_id),
- KEY server_id (server_id,domain,type)
-) TYPE=MyISAM;
-
-#
-# Daten f�r Tabelle `mail_domain`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur f�r Tabelle `mail_domain_alias`
-#
-
-DROP TABLE IF EXISTS mail_domain_alias;
-CREATE TABLE mail_domain_alias (
- domain_alias_id int(11) NOT NULL auto_increment,
- server_id int(11) NOT NULL default '0',
- domain varchar(255) NOT NULL default '',
- destination varchar(255) NOT NULL default '',
- PRIMARY KEY (domain_alias_id),
- KEY server_id (server_id,domain)
-) TYPE=MyISAM;
-
-#
-# Daten f�r Tabelle `mail_domain_alias`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur f�r Tabelle `mail_domain_catchall`
-#
-
-DROP TABLE IF EXISTS mail_domain_catchall;
-CREATE TABLE mail_domain_catchall (
- virtual_default_id int(11) NOT NULL auto_increment,
- server_id int(11) NOT NULL default '0',
- domain varchar(255) NOT NULL default '',
- dest varchar(255) NOT NULL default '',
- PRIMARY KEY (virtual_default_id),
- KEY server_id (server_id,domain)
-) TYPE=MyISAM;
-
-#
-# Daten f�r Tabelle `mail_domain_catchall`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur f�r Tabelle `mail_email`
-#
-
-DROP TABLE IF EXISTS mail_email;
-CREATE TABLE mail_email (
+DROP TABLE IF EXISTS mail_box;
+CREATE TABLE mail_box (
mailbox_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
server_id int(11) NOT NULL default '0',
email varchar(255) NOT NULL default '',
- type enum('mailbox','alias') NOT NULL default 'mailbox',
cryptpwd varchar(128) NOT NULL default '',
clearpwd varchar(128) NOT NULL default '',
name varchar(128) NOT NULL default '',
@@ -106,26 +57,79 @@
gid int(10) unsigned NOT NULL default '0',
maildir varchar(255) NOT NULL default '',
quota varchar(255) NOT NULL default '',
- cc varchar(50) NOT NULL default '',
- forward varchar(50) NOT NULL default '',
- autoresponder enum('yes','no') NOT NULL default 'no',
+ autoresponder enum('0','1') NOT NULL default '0',
autoresponder_text tinytext NOT NULL,
- enabled enum('yes','no') NOT NULL default 'yes',
- antivirus enum('yes','no') NOT NULL default 'no',
- spamscan enum('yes','no') NOT NULL default 'no',
- spamdelete enum('yes','no') NOT NULL default 'no',
+ active enum('0','1') NOT NULL default '1',
PRIMARY KEY (mailbox_id),
KEY server_id (server_id,email)
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `mail_email`
+# Daten f�r Tabelle `mail_box`
#
+INSERT INTO mail_box VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tt@test.int', '$1$tRlfKeOB$iHJgCn8mH8x/dh/XWy6v0/', '', '', 0, 0, '/var/spool/mail/till', '100', '0', '', '1');
+INSERT INTO mail_box VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'moin@test.int', '$1$Ee/.7y3.$wZ4BLXs/Pa80ka9X4ikN8.', '', '', 0, 0, '/var/spool/mail/test.int/moin', '10', '0', '', '1');
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `mail_greylist`
+# Tabellenstruktur f�r Tabelle `mail_domain`
+#
+
+DROP TABLE IF EXISTS mail_domain;
+CREATE TABLE mail_domain (
+ domain_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
+ domain varchar(255) NOT NULL default '',
+ type enum('local','relay','alias') NOT NULL default 'local',
+ destination varchar(255) NOT NULL default '',
+ active tinyint(4) NOT NULL default '1',
+ PRIMARY KEY (domain_id),
+ KEY server_id (server_id,domain,type)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `mail_domain`
+#
+
+INSERT INTO mail_domain VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'test.int', 'local', '', 1);
+INSERT INTO mail_domain VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.int', 'alias', 'test.int', 1);
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `mail_domain_catchall`
+#
+
+DROP TABLE IF EXISTS mail_domain_catchall;
+CREATE TABLE mail_domain_catchall (
+ domain_catchall_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
+ domain varchar(255) NOT NULL default '',
+ destination varchar(255) NOT NULL default '',
+ active enum('0','1') NOT NULL default '1',
+ PRIMARY KEY (domain_catchall_id),
+ KEY server_id (server_id,domain)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `mail_domain_catchall`
+#
+
+INSERT INTO mail_domain_catchall VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test.int', 'till@test.int', '1');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `mail_greylist`
#
DROP TABLE IF EXISTS mail_greylist;
@@ -141,13 +145,13 @@
) TYPE=MyISAM;
#
-# 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`
#
DROP TABLE IF EXISTS mail_mailman_domain;
@@ -163,32 +167,127 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `mail_mailman_domain`
+# Daten f�r Tabelle `mail_mailman_domain`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `mail_whitelist`
+# Tabellenstruktur f�r Tabelle `mail_redirect`
+#
+
+DROP TABLE IF EXISTS mail_redirect;
+CREATE TABLE mail_redirect (
+ redirect_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
+ email varchar(255) NOT NULL default '',
+ destination varchar(255) NOT NULL default '',
+ type enum('alias','forward') NOT NULL default 'alias',
+ active enum('0','1') NOT NULL default '1',
+ PRIMARY KEY (redirect_id),
+ KEY server_id (server_id,email)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `mail_redirect`
+#
+
+INSERT INTO mail_redirect VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.int', 'tt@test.int', 'alias', '1');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `mail_spamfilter`
+#
+
+DROP TABLE IF EXISTS mail_spamfilter;
+CREATE TABLE mail_spamfilter (
+ spamfilter_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
+ email varchar(255) NOT NULL default '',
+ spam_rewrite_score_int int(11) NOT NULL default '0',
+ spam_delete_score_int int(11) NOT NULL default '0',
+ spam_redirect_score_int int(11) NOT NULL default '0',
+ spam_rewrite_subject varchar(50) NOT NULL default '***SPAM***',
+ spam_redirect_maildir varchar(255) NOT NULL default '',
+ spam_redirect_maildir_purge int(11) NOT NULL default '7',
+ active enum('0','1') NOT NULL default '1',
+ PRIMARY KEY (spamfilter_id),
+ KEY server_id (server_id,email)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `mail_spamfilter`
+#
+
+INSERT INTO mail_spamfilter VALUES (1, 0, 0, '', '', '', 1, 'till@test.int', 100, 100, 1, '***SPAM mag ich nicht***', '/var/spool/mail/spam', 0, '1');
+INSERT INTO mail_spamfilter VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'till2@test.int', 500, 1500, 700, '***SPAM***', '/var/spool/mail/till', 14, '1');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `mail_transport`
+#
+
+DROP TABLE IF EXISTS mail_transport;
+CREATE TABLE mail_transport (
+ whitelist_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
+ domain varchar(255) NOT NULL default '',
+ destination varchar(255) NOT NULL default '',
+ active enum('0','1') NOT NULL default '1',
+ PRIMARY KEY (whitelist_id),
+ KEY server_id (server_id,destination),
+ KEY server_id_2 (server_id,domain)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `mail_transport`
+#
+
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `mail_whitelist`
#
DROP TABLE IF EXISTS mail_whitelist;
CREATE TABLE mail_whitelist (
whitelist_id int(11) 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) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
server_id int(11) NOT NULL default '0',
address varchar(255) NOT NULL default '',
+ recipient varchar(255) NOT NULL default '',
+ active enum('0','1') NOT NULL default '1',
PRIMARY KEY (whitelist_id),
KEY server_id (server_id,address)
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `mail_whitelist`
+# Daten f�r Tabelle `mail_whitelist`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `reseller`
+# Tabellenstruktur f�r Tabelle `reseller`
#
DROP TABLE IF EXISTS reseller;
@@ -227,13 +326,44 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `reseller`
+# Daten f�r Tabelle `reseller`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `server`
+# Tabellenstruktur f�r Tabelle `rr`
+#
+
+DROP TABLE IF EXISTS rr;
+CREATE TABLE rr (
+ id int(10) unsigned NOT NULL auto_increment,
+ zone int(10) unsigned NOT NULL default '0',
+ name varchar(64) NOT NULL default '',
+ type enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NS','PTR','RP','SRV','TXT') default NULL,
+ data varchar(128) NOT NULL default '',
+ aux int(10) unsigned NOT NULL default '0',
+ ttl int(10) unsigned NOT NULL default '86400',
+ sys_userid int(11) NOT NULL default '0',
+ sys_groupid int(11) NOT NULL default '0',
+ sys_perm_user varchar(5) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ PRIMARY KEY (id),
+ UNIQUE KEY rr (zone,name,type,data)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `rr`
+#
+
+INSERT INTO rr VALUES (1, 2, '1', 'PTR', 'www.ensign.de.', 0, 86400, 1, 0, 'riud', 'riud', '');
+INSERT INTO rr VALUES (2, 1, 'www', 'A', '192.168.0.1', 0, 86400, 1, 0, 'riud', 'riud', '');
+INSERT INTO rr VALUES (3, 1, 'ensign.de', 'A', '192.168.0.1', 0, 86400, 1, 0, 'riud', 'riud', '');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `server`
#
DROP TABLE IF EXISTS server;
@@ -245,26 +375,63 @@
sys_perm_group varchar(5) NOT NULL default '',
sys_perm_other varchar(5) NOT NULL default '',
server_name varchar(255) NOT NULL default '',
- mail_server int(11) NOT NULL default '0',
- web_server int(11) NOT NULL default '0',
- dns_server int(11) NOT NULL default '0',
- file_server int(11) NOT NULL default '0',
- mysql_server int(11) NOT NULL default '0',
- postgresql_server int(11) NOT NULL default '0',
- firebird_server int(11) NOT NULL default '0',
- active int(11) NOT NULL default '1',
+ mail_server tinyint(4) NOT NULL default '0',
+ web_server tinyint(4) NOT NULL default '0',
+ dns_server tinyint(4) NOT NULL default '0',
+ file_server tinyint(4) NOT NULL default '0',
+ db_server tinyint(4) NOT NULL default '0',
+ vserver_server tinyint(4) NOT NULL default '0',
+ config text NOT NULL,
+ `update` tinyint(4) NOT NULL default '0',
+ active tinyint(4) NOT NULL default '1',
PRIMARY KEY (server_id)
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `server`
+# Daten f�r Tabelle `server`
#
-INSERT INTO server VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, 0, 1);
+INSERT INTO server VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, '[global]\r\nwebserver=apache\r\nmailserver=exim\r\ndnsserver=mydns\r\n\r\n[mail]\r\nmodule=exim_mysql\r\nmaildir_path=/var/spool/mail/[domain]/[localpart]\r\nmailuser_uid=0\r\nmailuser_gid=0', 0, 1);
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `sys_datalog`
+# Tabellenstruktur f�r Tabelle `soa`
+#
+
+DROP TABLE IF EXISTS soa;
+CREATE TABLE soa (
+ id int(10) unsigned NOT NULL auto_increment,
+ origin varchar(255) NOT NULL default '',
+ ns varchar(255) NOT NULL default '',
+ mbox varchar(255) NOT NULL default '',
+ serial int(10) unsigned NOT NULL default '1',
+ refresh int(10) unsigned NOT NULL default '28800',
+ retry int(10) unsigned NOT NULL default '7200',
+ expire int(10) unsigned NOT NULL default '604800',
+ minimum int(10) unsigned NOT NULL default '86400',
+ ttl int(10) unsigned NOT NULL default '86400',
+ active enum('Y','N') NOT NULL default 'Y',
+ xfer varchar(255) NOT NULL default '',
+ sys_userid int(11) NOT NULL default '0',
+ sys_groupid int(11) NOT NULL default '0',
+ sys_perm_user varchar(5) NOT NULL default '',
+ sys_perm_group varchar(5) NOT NULL default '',
+ sys_perm_other varchar(5) NOT NULL default '',
+ PRIMARY KEY (id),
+ UNIQUE KEY origin (origin),
+ KEY active (active)
+) TYPE=MyISAM;
+
+#
+# Daten f�r Tabelle `soa`
+#
+
+INSERT INTO soa VALUES (1, 'ensign.de.', 'ns1.example.com.', 'admin.example.com.', 2006012103, 28800, 7200, 604800, 86400, 86400, 'Y', '', 1, 0, 'riud', 'riud', '');
+INSERT INTO soa VALUES (2, '0.168.192.in-addr.arpa.', 'ns1.example.com.', 'admin.example.com.', 2006012101, 28800, 7200, 604800, 86400, 86400, 'Y', '', 1, 0, 'riud', 'riud', '');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur f�r Tabelle `sys_datalog`
#
DROP TABLE IF EXISTS sys_datalog;
@@ -272,6 +439,7 @@
datalog_id bigint(20) NOT NULL auto_increment,
dbtable varchar(255) NOT NULL default '',
dbidx varchar(255) NOT NULL default '',
+ server_id int(11) NOT NULL default '0',
action char(1) NOT NULL default '',
tstamp bigint(20) NOT NULL default '0',
user varchar(255) NOT NULL default '',
@@ -280,13 +448,13 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `sys_datalog`
+# Daten f�r Tabelle `sys_datalog`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `sys_dbsync`
+# Tabellenstruktur f�r Tabelle `sys_dbsync`
#
DROP TABLE IF EXISTS sys_dbsync;
@@ -309,13 +477,13 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `sys_dbsync`
+# Daten f�r Tabelle `sys_dbsync`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `sys_filesync`
+# Tabellenstruktur f�r Tabelle `sys_filesync`
#
DROP TABLE IF EXISTS sys_filesync;
@@ -334,13 +502,13 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `sys_filesync`
+# Daten f�r Tabelle `sys_filesync`
#
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `sys_group`
+# Tabellenstruktur f�r Tabelle `sys_group`
#
DROP TABLE IF EXISTS sys_group;
@@ -352,7 +520,7 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `sys_group`
+# Daten f�r Tabelle `sys_group`
#
INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
@@ -360,7 +528,7 @@
# --------------------------------------------------------
#
-# Tabellenstruktur f�r Tabelle `sys_user`
+# Tabellenstruktur f�r Tabelle `sys_user`
#
DROP TABLE IF EXISTS sys_user;
@@ -396,8 +564,8 @@
) TYPE=MyISAM;
#
-# Daten f�r Tabelle `sys_user`
+# Daten f�r Tabelle `sys_user`
#
-INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,clients,designer,resellers,sites', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
+INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,designer,mail,dns', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
--
Gitblit v1.9.1