From b7a799ba188f617852b2f540d6704ac8143fbbc5 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 19 Sep 2007 08:47:12 +0000 Subject: [PATCH] DATABASE_* - remove vacation stuff, and keep it in VIRTUAL_VACATION/DATABASE.txt git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@55 a1433add-5e2c-0410-b055-b7f2511e0802 --- DATABASE_MYSQL.TXT | 14 -------------- DATABASE_PGSQL.TXT | 27 +-------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/DATABASE_MYSQL.TXT b/DATABASE_MYSQL.TXT index 97736fb6..c77a52d8 100644 --- a/DATABASE_MYSQL.TXT +++ b/DATABASE_MYSQL.TXT @@ -126,20 +126,6 @@ CREATE TABLE `mailbox` ( KEY username (`username`) ) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes'; -# -# Table structure for table vacation -# -CREATE TABLE `vacation` ( - `email` varchar(255) NOT NULL default '', - `subject` varchar(255) NOT NULL default '', - `body` text NOT NULL default '', - `cache` text NOT NULL default '', - `domain` varchar(255) NOT NULL default '', - `created` datetime NOT NULL default '0000-00-00 00:00:00', - `active` tinyint(1) NOT NULL default '1', - PRIMARY KEY (`email`), - KEY email (`email`) -) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Vacation'; # superadmin user & password (login: admin@domain.tld, password: admin) INSERT INTO domain_admins (username, domain, active) VALUES ('admin@domain.tld','ALL','1'); diff --git a/DATABASE_PGSQL.TXT b/DATABASE_PGSQL.TXT index 5067b80a..9efa3bb8 100644 --- a/DATABASE_PGSQL.TXT +++ b/DATABASE_PGSQL.TXT @@ -15,7 +15,6 @@ -- You can create the database from the shell with: -- createuser -P postfix -- createuser -P postfixadmin --- createuser -P vacation -- createdb postfix -- psql postfix -- postfix=# \i postfix.sql @@ -25,7 +24,7 @@ -- Postfix / PgSQL -- -DROP TABLE admin,alias,domain,domain_admins,log,mailbox,vacation,vacation_notification CASCADE; +DROP TABLE admin,alias,domain,domain_admins,log,mailbox CASCADE; -- -- @@ -116,27 +115,6 @@ CREATE TABLE mailbox ( CREATE INDEX mailbox_username_active ON mailbox(username,active); COMMENT ON TABLE mailbox IS 'Postfix Admin - Virtual Mailboxes'; -CREATE TABLE vacation ( - email character varying(255) PRIMARY KEY, - subject character varying(255) NOT NULL DEFAULT '', - body text NOT NULL DEFAULT '', - cache text NOT NULL DEFAULT '', - "domain" character varying(255) NOT NULL REFERENCES "domain", - created timestamp with time zone DEFAULT now(), - active boolean DEFAULT true NOT NULL -); -CREATE INDEX vacation_email_active ON vacation(email,active); - -CREATE TABLE vacation_notification ( - on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE, - notified character varying(255) NOT NULL, - notified_at timestamp with time zone NOT NULL DEFAULT now(), - CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified) -); --- Note: It's important the the primary key constraint on vacation_notification --- be given a name which includes the '_pkey' substring (default PostgreSQL naming --- for primary keys). The vacation-script looks for this substring to --- distinguish between an acceptable and non-acceptable error. GRANT @@ -148,13 +126,10 @@ ON domain_admins, log, mailbox, - vacation TO postfixadmin; GRANT SELECT ON alias,domain,mailbox TO postfix; -GRANT SELECT ON vacation TO vacation; -GRANT SELECT,INSERT,DELETE ON vacation_notification TO vacation; -- superadmin user & password (login: admin@domain.tld, password: admin) INSERT INTO domain (domain) VALUES ('ALL');