Changeset 598 for branches/stable/cgi-bin/ipdb.psql

Timestamp:

05/16/13 16:43:45 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Introduce informational VRF tags on allocations to match uncomitted patch
in production.
Also add a minor main.cgi error-log-cleanup hack around deleting routed
blocks and master blocks instead of bending getBlockData() out of shape
only to have to put it back when the database structure changes get merged.

File:

• branches/stable/cgi-bin/ipdb.psql (modified) (4 diffs)

branches/stable/cgi-bin/ipdb.psql

@@ -33 +33 @@
 );
 
-CREATE TABLE "temp" (
-        "ofs" integer
-);
-
 CREATE TABLE "freeblocks" (
         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
@@ -57 +53 @@
         "createstamp" timestamp DEFAULT now(),
         "modifystamp" timestamp DEFAULT now(),
+        "vrf" character varying(128) DEFAULT '' NOT NULL,
         CHECK (((available = 'y'::bpchar) OR (available = 'n'::bpchar)))
 );
@@ -73 +70 @@
         "custid" character varying(16) DEFAULT '',
         swip character(1) DEFAULT 'n'
+        "vrf" character varying(128) DEFAULT '' NOT NULL,
 );
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid, allocations.vrf FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid, poolips.vrf FROM poolips;
 
 CREATE TABLE "alloctypes" (
@@ -154 +152 @@
 
 CREATE TABLE "users" (
-        "username" varchar(16) NOT NULL PRIMARY KEY,
-        "password" varchar(16) DEFAULT '',
-        "acl" varchar(16) DEFAULT 'b'
+        "username" varchar(40) NOT NULL PRIMARY KEY,
+        "password" varchar(60) DEFAULT '',
+        "acl" varchar(30) DEFAULT 'b'
 );
 
 -- Default password is admin
 INSERT INTO users VALUES ('admin','luef5C4XumqIs','bacdsA');
-
-CREATE TABLE "dns" (
-        "ip" inet NOT NULL PRIMARY KEY,
-        "hostname" character varying(128),
-        "auto" character(1) DEFAULT 'y'
-);
 
 -- Network nodes - allows finding customers affected by a broken <x> quickly