- repository reorganization

git-svn-id: file:///home/www/usr01/svn/gnuviechadmin/trunk@242 a67ec6bc-e5d5-0310-a910-815c51eb3124

testdb/dbschema/gnuviechadmin/README

@@ -0,0 +1,4 @@
+This is a database migration repository.
+
+More information at
+http://trac.erosson.com/migrate

testdb/dbschema/gnuviechadmin/manage.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+from migrate.versioning.shell import main
+
+main(repository='gnuviechadmin')

testdb/dbschema/gnuviechadmin/migrate.cfg

@@ -0,0 +1,20 @@
+[db_settings]
+# Used to identify which repository this database is versioned under.
+# You can use the name of your project.
+repository_id=GNUViech Admin
+
+# The name of the database table used to track the schema version.
+# This name shouldn't already be used by your project.
+# If this is changed once a database is under version control, you'll need to 
+# change the table name in each database too. 
+version_table=migrate_version
+
+# When committing a change script, Migrate will attempt to generate the 
+# sql for all supported databases; normally, if one of them fails - probably
+# because you don't have that database installed - it is ignored and the 
+# commit continues, perhaps ending successfully. 
+# Databases in this list MUST compile successfully during a commit, or the 
+# entire commit will fail. List the databases your application will actually 
+# be using to ensure your updates to that database work properly.
+# This must be a list; example: ['postgres','sqlite']
+required_dbs=[]

testdb/dbschema/gnuviechadmin/versions/1/1.py

@@ -0,0 +1,33 @@
+# setup tables for spamassassin
+from sqlalchemy import *
+from migrate import *
+
+meta = BoundMetaData(migrate_engine)
+domains = Table('domains', meta, autoload = True)
+mailalias = Table(
+    'mailalias', meta,
+    Column('mailaliasid', Integer,  primary_key = True),
+    Column('domainid', Integer, ForeignKey('domains.id'), nullable = False),
+    Column('email', String(255), nullable = False),
+    Column('target', TEXT, nullable = False),
+    UniqueConstraint('email', 'domainid'))
+
+mailpassword = Table(
+    'mailpassword', meta,
+    Column('id', String(18), primary_key = True),
+    Column('domainid', Integer, ForeignKey('domains.id'), nullable = False),
+    Column('uid', Integer, nullable = False),
+    Column('gid', Integer, nullable = False),
+    Column('home', String(255), nullable = False),
+    Column('cryptpass', String(34), nullable = False),
+    Column('clearpass', String(64), nullable = False),
+    Column('spamcheck', Boolean, default = False),
+    Column('sajunkscore', Integer))
+
+def upgrade():
+    mailalias.create()
+    mailpassword.create()
+
+def downgrade():
+    mailpassword.drop()
+    mailalias.drop()

testdb/dbschema/gnuviechadmin/versions/2/2.py

@@ -0,0 +1,40 @@
+from sqlalchemy import *
+from migrate import *
+
+meta = BoundMetaData(migrate_engine)
+client_table = Table(
+    'client', meta,
+    Column('clientid', Integer, primary_key = True),
+    Column('firstname', String(40), nullable = False),
+    Column('lastname', String(40), nullable = False),
+    Column('address1', String(40), nullable = False),
+    Column('address2', String(40)),
+    Column('country', String(40)),
+    Column('town', String(50), nullable = False),
+    Column('zipcode', String(5), nullable = False),
+    Column('state', String(40)),
+    Column('active', Boolean, default = False, nullable = False),
+    Column('phone', String(20)),
+    Column('mobile', String(20)))
+
+sysuser_table = Table(
+    'sysuser', meta,
+    Column('sysuserid', Integer, primary_key = True),
+    Column('name', String(12), nullable = False),
+    Column('type', Integer, default = 0, nullable = False),
+    Column('home', String(128)),
+    Column('shell', Boolean),
+    Column('password', String(64)),
+    Column('clientid', Integer, ForeignKey('client.clientid'),
+           nullable = False),
+    Column('toupdate', Boolean, default = False, nullable = False),
+    Column('md5pass', String(34)),
+    Column('sysuid', Integer))
+
+def upgrade():
+    client_table.create()
+    sysuser_table.create()
+
+def downgrade():
+    sysuser_table.drop()
+    client_table.drop()

testdb/dbschema/gnuviechadmin/versions/3/3.py

@@ -0,0 +1,17 @@
+from sqlalchemy import *
+from migrate import *
+import migrate.changeset
+
+meta = BoundMetaData(migrate_engine)
+sysuser = Table('sysuser', meta, autoload = True)
+domains = Table('domains', meta, autoload = True)
+sysuidrefcol = Column('sysuserid', Integer,
+                      ForeignKey('sysuser.sysuserid'),
+                      nullable = False)
+
+def upgrade():
+    sysuidrefcol.create(domains)
+
+def downgrade():
+    col = domains.c.sysuserid
+    col.drop()

testdb/dbschema/initdb.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+dirname=$(pwd)
+dbname=testdb
+dbuser=jan
+dbpassword=heyyou97
+reponame=gnuviechadmin
+dburl=postgres://$dbuser:$dbpassword@localhost:5432/$dbname
+
+sudo su - postgres -c "createdb -O $dbuser -E UTF-8 $dbname"
+sudo su - postgres -c "psql $dbname < $dirname/initdb.sql"
+
+#migrate create $reponame "GNUViech Admin"
+migrate version_control $dburl $reponame
+migrate manage manage.py --repository=$reponame --url=$dburl
+python manage.py upgrade

testdb/dbschema/initdb.sql

@@ -0,0 +1,188 @@
+-- initial schema setup for postgresql
+
+-- spamassassin bayes storage
+
+CREATE PROCEDURAL LANGUAGE plpgsql;
+
+SET search_path = public, pg_catalog;
+
+CREATE TABLE bayes_expire (
+  id integer NOT NULL default '0',
+  runtime integer NOT NULL default '0'
+) WITHOUT OIDS;
+
+CREATE INDEX bayes_expire_idx1 ON bayes_expire (id);
+
+CREATE TABLE bayes_global_vars (
+  variable varchar(30) NOT NULL default '',
+  value varchar(200) NOT NULL default '',
+  PRIMARY KEY  (variable)
+) WITHOUT OIDS;
+
+INSERT INTO bayes_global_vars VALUES ('VERSION','3');
+
+CREATE TABLE bayes_seen (
+  id integer NOT NULL default '0',
+  msgid varchar(200) NOT NULL default '',
+  flag character(1) NOT NULL default '',
+  PRIMARY KEY  (id,msgid)
+) WITHOUT OIDS;
+
+CREATE TABLE bayes_token (
+  id integer NOT NULL default '0',
+  token bytea NOT NULL default '',
+  spam_count integer NOT NULL default '0',
+  ham_count integer NOT NULL default '0',
+  atime integer NOT NULL default '0',
+  PRIMARY KEY  (id,token)
+) WITHOUT OIDS;
+
+CREATE INDEX bayes_token_idx1 ON bayes_token (token);
+
+CREATE TABLE bayes_vars (
+  id serial NOT NULL,
+  username varchar(200) NOT NULL default '',
+  spam_count integer NOT NULL default '0',
+  ham_count integer NOT NULL default '0',
+  token_count integer NOT NULL default '0',
+  last_expire integer NOT NULL default '0',
+  last_atime_delta integer NOT NULL default '0',
+  last_expire_reduce integer NOT NULL default '0',
+  oldest_token_age integer NOT NULL default '2147483647',
+  newest_token_age integer NOT NULL default '0',
+  PRIMARY KEY  (id)
+) WITHOUT OIDS;
+
+CREATE UNIQUE INDEX bayes_vars_idx1 ON bayes_vars (username);
+
+CREATE OR REPLACE FUNCTION greatest_int (integer, integer)
+ RETURNS INTEGER
+ IMMUTABLE STRICT
+ AS 'SELECT CASE WHEN $1 < $2 THEN $2 ELSE $1 END;'
+ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION least_int (integer, integer)
+ RETURNS INTEGER
+ IMMUTABLE STRICT
+ AS 'SELECT CASE WHEN $1 < $2 THEN $1 ELSE $2 END;'
+ LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION put_tokens(inuserid INTEGER,
+                                      intokenary BYTEA[],
+                                      inspam_count INTEGER,
+                                      inham_count INTEGER,
+                                      inatime INTEGER)
+RETURNS VOID AS ' 
+DECLARE
+  _token BYTEA;
+  new_tokens INTEGER := 0;
+BEGIN
+  for i in array_lower(intokenary, 1) .. array_upper(intokenary, 1)
+  LOOP
+    _token := intokenary[i];
+    UPDATE bayes_token
+       SET spam_count = greatest_int(spam_count + inspam_count, 0),
+           ham_count = greatest_int(ham_count + inham_count, 0),
+           atime = greatest_int(atime, inatime)
+     WHERE id = inuserid 
+       AND token = _token;
+    IF NOT FOUND THEN 
+      -- we do not insert negative counts, just return true
+      IF NOT (inspam_count < 0 OR inham_count < 0) THEN
+        INSERT INTO bayes_token (id, token, spam_count, ham_count, atime) 
+        VALUES (inuserid, _token, inspam_count, inham_count, inatime); 
+        IF FOUND THEN
+          new_tokens := new_tokens + 1;
+        END IF;
+      END IF;
+    END IF;
+  END LOOP;
+
+  IF new_tokens > 0 AND inatime > 0 THEN
+    UPDATE bayes_vars
+       SET token_count = token_count + new_tokens,
+           newest_token_age = greatest_int(newest_token_age, inatime),
+           oldest_token_age = least_int(oldest_token_age, inatime)
+     WHERE id = inuserid;
+  ELSEIF new_tokens > 0 AND NOT inatime > 0 THEN
+    UPDATE bayes_vars
+       SET token_count = token_count + new_tokens
+     WHERE id = inuserid;
+  ELSEIF NOT new_tokens > 0 AND inatime > 0 THEN
+    UPDATE bayes_vars
+       SET newest_token_age = greatest_int(newest_token_age, inatime),
+           oldest_token_age = least_int(oldest_token_age, inatime)
+     WHERE id = inuserid;
+  END IF;
+  RETURN;
+END; 
+' LANGUAGE 'plpgsql'; 
+
+-- tables for spamassassin auto-whitelists
+
+CREATE TABLE awl (
+  username varchar(100) NOT NULL default '',
+  email varchar(200) NOT NULL default '',
+  ip varchar(10) NOT NULL default '',
+  count bigint default '0',
+  totscore float default '0'
+);
+CREATE UNIQUE INDEX awl_pkey ON awl (username,email,ip);
+
+-- tables for spamassassin user preferences
+
+CREATE TABLE userpref (
+  prefid bigserial NOT NULL unique primary key,
+  username varchar(100) NOT NULL,
+  preference varchar(30) NOT NULL,
+  value varchar(100) NOT NULL
+);
+CREATE INDEX userpref_username_idx ON userpref(username);
+
+-- tables for powerdns
+
+CREATE TABLE domains (
+  id SERIAL PRIMARY KEY,
+  name VARCHAR(255) NOT NULL UNIQUE,
+  master VARCHAR(20) DEFAULT NULL,
+  last_check INT DEFAULT NULL,
+  type VARCHAR(6) NOT NULL,
+  notified_serial INT DEFAULT NULL,
+  account VARCHAR(40) DEFAULT NULL
+);
+
+CREATE TABLE records (
+  id SERIAL PRIMARY KEY,
+  domain_id INT DEFAULT NULL,
+  name VARCHAR(255) DEFAULT NULL,
+  type VARCHAR(6) DEFAULT NULL,
+  content VARCHAR(255) DEFAULT NULL,
+  ttl INT DEFAULT NULL,
+  prio INT DEFAULT NULL,
+  change_date INT DEFAULT NULL,
+  CONSTRAINT domain_exists
+  FOREIGN KEY(domain_id) REFERENCES domains(id)
+  ON DELETE CASCADE
+);
+
+CREATE INDEX rec_name_index ON records(name);
+CREATE INDEX nametype_index ON records(name, type);
+CREATE INDEX domain_id ON records(domain_id);
+
+CREATE TABLE supermasters (
+  ip VARCHAR(25) NOT NULL,
+  nameserver VARCHAR(255) NOT NULL,
+  account VARCHAR(40) DEFAULT NULL
+);
+
+GRANT ALL ON supermasters TO jan;
+GRANT ALL ON domains TO jan;
+GRANT ALL ON domains_id_seq TO jan;
+GRANT ALL ON records TO jan;
+GRANT ALL ON records_id_seq TO jan;
+
+-- GRANT SELECT ON supermasters TO pdns;
+-- GRANT ALL ON domains TO pdns;
+-- GRANT ALL ON domains_id_seq TO pdns;
+-- GRANT ALL ON records TO pdns;
+-- GRANT ALL ON records_id_seq TO pdns;

testdb/dbschema/manage.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+from migrate.versioning.shell import main
+
+main(url='postgres://jan:heyyou97@localhost:5432/testdb',repository='gnuviechadmin')