summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbSetup/dbSetup.mysql41
-rw-r--r--dbSetup/dbtestdata.sql (renamed from dbtestdata.sql)0
-rw-r--r--dbsetup.sql18
-rw-r--r--pmacct/dbGrant.mysql1
-rw-r--r--pmacct/dbSetupCustom.mysql20
5 files changed, 41 insertions, 39 deletions
diff --git a/dbSetup/dbSetup.mysql b/dbSetup/dbSetup.mysql
new file mode 100644
index 0000000..45ed9aa
--- /dev/null
+++ b/dbSetup/dbSetup.mysql
@@ -0,0 +1,41 @@
+USE pmacct;
+
+drop database if exists pmacct;
+create database pmacct;
+use pmacct;
+
+drop table if exists acct;
+ create table acct (
+ ip_src CHAR(39) NOT NULL,
+ ip_dst CHAR(39) NOT NULL,
+ as_src INT(4) UNSIGNED NOT NULL,
+ as_dst INT(4) UNSIGNED NOT NULL,
+ port_src INT(2) UNSIGNED NOT NULL,
+ port_dst INT(2) UNSIGNED NOT NULL,
+ packets INT UNSIGNED NOT NULL,
+ bytes INT UNSIGNED NOT NULL,
+ pkt_len_distrib CHAR(10) NOT NULL,
+ stamp_inserted DATETIME NOT NULL,
+ stamp_updated DATETIME,
+ stamp_processed DATETIME,
+ PRIMARY KEY (ip_src, ip_dst, as_src, as_dst, port_src, port_dst, pkt_len_distrib, stamp_inserted)
+);
+
+DROP TABLE IF EXISTS clean_data;
+
+CREATE TABLE clean_data (
+ ipb_src CHAR(39) NOT NULL,
+ ipb_dst CHAR(39) NOT NULL,
+ as_src INT(4) UNSIGNED NOT NULL,
+ as_dst INT(4) UNSIGNED NOT NULL,
+ port_src INT(2) UNSIGNED NOT NULL,
+ port_dst INT(2) UNSIGNED NOT NULL,
+ occurences INT UNSIGNED NOT NULL,
+ volume CHAR(10) NOT NULL,
+ time_added DATETIME NOT NULL,
+ time_privatized DATETIME,
+ UNIQUE idx (ipb_src, ipb_dst, as_src, as_dst, port_src, port_dst, volume, time_added)
+);
+
+grant all privileges on pmacct.* to flowcleaner@localhost identified by 'nil' with grant option;
+grant all privileges on pmacct.* to pmacct@localhost identified by 'arealsmartpwd' with grant option;
diff --git a/dbtestdata.sql b/dbSetup/dbtestdata.sql
index 7f877f1..7f877f1 100644
--- a/dbtestdata.sql
+++ b/dbSetup/dbtestdata.sql
diff --git a/dbsetup.sql b/dbsetup.sql
deleted file mode 100644
index 91ac8ee..0000000
--- a/dbsetup.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-USE pmacct;
-
-DROP TABLE IF EXISTS clean_data;
-
-CREATE TABLE clean_data (
- ipb_src CHAR(39) NOT NULL,
- ipb_dst CHAR(39) NOT NULL,
- as_src INT(4) UNSIGNED NOT NULL,
- as_dst INT(4) UNSIGNED NOT NULL,
- port_src INT(2) UNSIGNED NOT NULL,
- port_dst INT(2) UNSIGNED NOT NULL,
- occurences INT UNSIGNED NOT NULL,
- volume CHAR(10) NOT NULL,
- time DATETIME NOT NULL,
- UNIQUE idx (ipb_src, ipb_dst, as_src, as_dst, port_src, port_dst, volume, time)
-);
-
-grant all privileges on pmacct.* to flowcleaner@localhost identified by 'nil' with grant option;
diff --git a/pmacct/dbGrant.mysql b/pmacct/dbGrant.mysql
deleted file mode 100644
index 6266e46..0000000
--- a/pmacct/dbGrant.mysql
+++ /dev/null
@@ -1 +0,0 @@
-grant all privileges on pmacct.* to pmacct@localhost identified by 'arealsmartpwd' with grant option;
diff --git a/pmacct/dbSetupCustom.mysql b/pmacct/dbSetupCustom.mysql
deleted file mode 100644
index 167ffb1..0000000
--- a/pmacct/dbSetupCustom.mysql
+++ /dev/null
@@ -1,20 +0,0 @@
-drop database if exists pmacct;
-create database pmacct;
-use pmacct;
-
-drop table if exists acct;
- create table acct (
- ip_src CHAR(39) NOT NULL,
- ip_dst CHAR(39) NOT NULL,
- as_src INT(4) UNSIGNED NOT NULL,
- as_dst INT(4) UNSIGNED NOT NULL,
- port_src INT(2) UNSIGNED NOT NULL,
- port_dst INT(2) UNSIGNED NOT NULL,
- packets INT UNSIGNED NOT NULL,
- bytes INT UNSIGNED NOT NULL,
- pkt_len_distrib CHAR(10) NOT NULL,
- stamp_inserted DATETIME NOT NULL,
- stamp_updated DATETIME,
- PRIMARY KEY (ip_src, ip_dst, as_src, as_dst, port_src, port_dst, pkt_len_distrib, stamp_inserted)
-);
-