utils/kamctl: db creation scripts refreshed after schema updates

kamailio · Oct 6, 2016 · 57c1f40 · 57c1f40
1 parent 46f91d8
commit 57c1f40
Show file tree

Hide file tree

Showing 19 changed files with 69 additions and 57 deletions.
diff --git a/utils/kamctl/db_berkeley/kamailio/subscriber b/utils/kamctl/db_berkeley/kamailio/subscriber
@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) username(str) domain(str) password(str) email_address(str) ha1(str) ha1b(str) rpid(str)
+id(int) username(str) domain(str) password(str) ha1(str) ha1b(str) email_address(str) rpid(str)
 METADATA_KEY
 1 2 
 METADATA_READONLY

diff --git a/utils/kamctl/db_berkeley/kamailio/uacreg b/utils/kamctl/db_berkeley/kamailio/uacreg
@@ -1,10 +1,10 @@
 METADATA_COLUMNS
-id(int) l_uuid(str) l_username(str) l_domain(str) r_username(str) r_domain(str) realm(str) auth_username(str) auth_password(str) auth_proxy(str) expires(int) flags(int) reg_delay(int)
+id(int) l_uuid(str) l_username(str) l_domain(str) r_username(str) r_domain(str) realm(str) auth_username(str) auth_password(str) auth_ha1(str) auth_proxy(str) expires(int) flags(int) reg_delay(int)
 METADATA_KEY
 
 METADATA_READONLY
 0
 METADATA_LOGFLAGS
 0
 METADATA_DEFAULTS
-NIL|''|''|''|''|''|''|''|''|''|0|0|0
+NIL|''|''|''|''|''|''|''|''|''|''|0|0|0
diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version
@@ -115,15 +115,15 @@ sip_trace|4
 speed_dial|
 speed_dial|2
 subscriber|
-subscriber|6
+subscriber|7
 topos_d|
 topos_d|1
 topos_t|
 topos_t|1
 trusted|
 trusted|6
 uacreg|
-uacreg|2
+uacreg|3
 uid_credentials|
 uid_credentials|7
 uid_domain|

diff --git a/utils/kamctl/db_sqlite/auth_db-create.sql b/utils/kamctl/db_sqlite/auth_db-create.sql
@@ -2,15 +2,15 @@ CREATE TABLE subscriber (
     id INTEGER PRIMARY KEY NOT NULL,
     username VARCHAR(64) DEFAULT '' NOT NULL,
     domain VARCHAR(64) DEFAULT '' NOT NULL,
-    password VARCHAR(25) DEFAULT '' NOT NULL,
-    email_address VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1 VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1b VARCHAR(64) DEFAULT '' NOT NULL,
-    rpid VARCHAR(64) DEFAULT NULL,
+    password VARCHAR(64) DEFAULT '' NOT NULL,
+    ha1 VARCHAR(128) DEFAULT '' NOT NULL,
+    ha1b VARCHAR(128) DEFAULT '' NOT NULL,
+    email_address VARCHAR(128) DEFAULT '' NOT NULL,
+    rpid VARCHAR(128) DEFAULT NULL,
     CONSTRAINT subscriber_account_idx UNIQUE (username, domain)
 );
 
 CREATE INDEX subscriber_username_idx ON subscriber (username);
 
-INSERT INTO version (table_name, table_version) values ('subscriber','6');
+INSERT INTO version (table_name, table_version) values ('subscriber','7');
 
diff --git a/utils/kamctl/db_sqlite/uac-create.sql b/utils/kamctl/db_sqlite/uac-create.sql
@@ -2,18 +2,19 @@ CREATE TABLE uacreg (
     id INTEGER PRIMARY KEY NOT NULL,
     l_uuid VARCHAR(64) DEFAULT '' NOT NULL,
     l_username VARCHAR(64) DEFAULT '' NOT NULL,
-    l_domain VARCHAR(128) DEFAULT '' NOT NULL,
+    l_domain VARCHAR(64) DEFAULT '' NOT NULL,
     r_username VARCHAR(64) DEFAULT '' NOT NULL,
-    r_domain VARCHAR(128) DEFAULT '' NOT NULL,
+    r_domain VARCHAR(64) DEFAULT '' NOT NULL,
     realm VARCHAR(64) DEFAULT '' NOT NULL,
     auth_username VARCHAR(64) DEFAULT '' NOT NULL,
     auth_password VARCHAR(64) DEFAULT '' NOT NULL,
-    auth_proxy VARCHAR(64) DEFAULT '' NOT NULL,
+    auth_ha1 VARCHAR(128) DEFAULT '' NOT NULL,
+    auth_proxy VARCHAR(128) DEFAULT '' NOT NULL,
     expires INTEGER DEFAULT 0 NOT NULL,
     flags INTEGER DEFAULT 0 NOT NULL,
     reg_delay INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid)
 );
 
-INSERT INTO version (table_name, table_version) values ('uacreg','2');
+INSERT INTO version (table_name, table_version) values ('uacreg','3');
 
diff --git a/utils/kamctl/dbtext/kamailio/subscriber b/utils/kamctl/dbtext/kamailio/subscriber
@@ -1 +1 @@
-id(int,auto) username(string) domain(string) password(string) email_address(string) ha1(string) ha1b(string) rpid(string,null) 
+id(int,auto) username(string) domain(string) password(string) ha1(string) ha1b(string) email_address(string) rpid(string,null) 
diff --git a/utils/kamctl/dbtext/kamailio/uacreg b/utils/kamctl/dbtext/kamailio/uacreg
@@ -1 +1 @@
-id(int,auto) l_uuid(string) l_username(string) l_domain(string) r_username(string) r_domain(string) realm(string) auth_username(string) auth_password(string) auth_proxy(string) expires(int) flags(int) reg_delay(int) 
+id(int,auto) l_uuid(string) l_username(string) l_domain(string) r_username(string) r_domain(string) realm(string) auth_username(string) auth_password(string) auth_ha1(string) auth_proxy(string) expires(int) flags(int) reg_delay(int) 
diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version
@@ -52,11 +52,11 @@ sca_subscriptions:2
 silo:8
 sip_trace:4
 speed_dial:2
-subscriber:6
+subscriber:7
 topos_d:1
 topos_t:1
 trusted:6
-uacreg:2
+uacreg:3
 uid_credentials:7
 uid_domain:2
 uid_domain_attrs:1

diff --git a/utils/kamctl/mysql/auth_db-create.sql b/utils/kamctl/mysql/auth_db-create.sql
@@ -2,15 +2,15 @@ CREATE TABLE `subscriber` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `username` VARCHAR(64) DEFAULT '' NOT NULL,
     `domain` VARCHAR(64) DEFAULT '' NOT NULL,
-    `password` VARCHAR(25) DEFAULT '' NOT NULL,
-    `email_address` VARCHAR(64) DEFAULT '' NOT NULL,
-    `ha1` VARCHAR(64) DEFAULT '' NOT NULL,
-    `ha1b` VARCHAR(64) DEFAULT '' NOT NULL,
-    `rpid` VARCHAR(64) DEFAULT NULL,
+    `password` VARCHAR(64) DEFAULT '' NOT NULL,
+    `ha1` VARCHAR(128) DEFAULT '' NOT NULL,
+    `ha1b` VARCHAR(128) DEFAULT '' NOT NULL,
+    `email_address` VARCHAR(128) DEFAULT '' NOT NULL,
+    `rpid` VARCHAR(128) DEFAULT NULL,
     CONSTRAINT account_idx UNIQUE (`username`, `domain`)
 );
 
 CREATE INDEX username_idx ON subscriber (`username`);
 
-INSERT INTO version (table_name, table_version) values ('subscriber','6');
+INSERT INTO version (table_name, table_version) values ('subscriber','7');
 
diff --git a/utils/kamctl/mysql/uac-create.sql b/utils/kamctl/mysql/uac-create.sql
@@ -2,18 +2,19 @@ CREATE TABLE `uacreg` (
     `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     `l_uuid` VARCHAR(64) DEFAULT '' NOT NULL,
     `l_username` VARCHAR(64) DEFAULT '' NOT NULL,
-    `l_domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    `l_domain` VARCHAR(64) DEFAULT '' NOT NULL,
     `r_username` VARCHAR(64) DEFAULT '' NOT NULL,
-    `r_domain` VARCHAR(128) DEFAULT '' NOT NULL,
+    `r_domain` VARCHAR(64) DEFAULT '' NOT NULL,
     `realm` VARCHAR(64) DEFAULT '' NOT NULL,
     `auth_username` VARCHAR(64) DEFAULT '' NOT NULL,
     `auth_password` VARCHAR(64) DEFAULT '' NOT NULL,
-    `auth_proxy` VARCHAR(64) DEFAULT '' NOT NULL,
+    `auth_ha1` VARCHAR(128) DEFAULT '' NOT NULL,
+    `auth_proxy` VARCHAR(128) DEFAULT '' NOT NULL,
     `expires` INT DEFAULT 0 NOT NULL,
     `flags` INT DEFAULT 0 NOT NULL,
     `reg_delay` INT DEFAULT 0 NOT NULL,
     CONSTRAINT l_uuid_idx UNIQUE (`l_uuid`)
 );
 
-INSERT INTO version (table_name, table_version) values ('uacreg','2');
+INSERT INTO version (table_name, table_version) values ('uacreg','3');
 
diff --git a/utils/kamctl/oracle/auth_db-create.sql b/utils/kamctl/oracle/auth_db-create.sql
@@ -2,11 +2,11 @@ CREATE TABLE subscriber (
     id NUMBER(10) PRIMARY KEY,
     username VARCHAR2(64) DEFAULT '',
     domain VARCHAR2(64) DEFAULT '',
-    password VARCHAR2(25) DEFAULT '',
-    email_address VARCHAR2(64) DEFAULT '',
-    ha1 VARCHAR2(64) DEFAULT '',
-    ha1b VARCHAR2(64) DEFAULT '',
-    rpid VARCHAR2(64) DEFAULT NULL,
+    password VARCHAR2(64) DEFAULT '',
+    ha1 VARCHAR2(128) DEFAULT '',
+    ha1b VARCHAR2(128) DEFAULT '',
+    email_address VARCHAR2(128) DEFAULT '',
+    rpid VARCHAR2(128) DEFAULT NULL,
     CONSTRAINT subscriber_account_idx  UNIQUE (username, domain)
 );
 
@@ -20,5 +20,5 @@ BEGIN map2users('subscriber'); END;
 /
 CREATE INDEX subscriber_username_idx  ON subscriber (username);
 
-INSERT INTO version (table_name, table_version) values ('subscriber','6');
+INSERT INTO version (table_name, table_version) values ('subscriber','7');
 
diff --git a/utils/kamctl/oracle/uac-create.sql b/utils/kamctl/oracle/uac-create.sql
@@ -2,13 +2,14 @@ CREATE TABLE uacreg (
     id NUMBER(10) PRIMARY KEY,
     l_uuid VARCHAR2(64) DEFAULT '',
     l_username VARCHAR2(64) DEFAULT '',
-    l_domain VARCHAR2(128) DEFAULT '',
+    l_domain VARCHAR2(64) DEFAULT '',
     r_username VARCHAR2(64) DEFAULT '',
-    r_domain VARCHAR2(128) DEFAULT '',
+    r_domain VARCHAR2(64) DEFAULT '',
     realm VARCHAR2(64) DEFAULT '',
     auth_username VARCHAR2(64) DEFAULT '',
     auth_password VARCHAR2(64) DEFAULT '',
-    auth_proxy VARCHAR2(64) DEFAULT '',
+    auth_ha1 VARCHAR2(128) DEFAULT '',
+    auth_proxy VARCHAR2(128) DEFAULT '',
     expires NUMBER(10) DEFAULT 0 NOT NULL,
     flags NUMBER(10) DEFAULT 0 NOT NULL,
     reg_delay NUMBER(10) DEFAULT 0 NOT NULL,
@@ -23,5 +24,5 @@ END uacreg_tr;
 /
 BEGIN map2users('uacreg'); END;
 /
-INSERT INTO version (table_name, table_version) values ('uacreg','2');
+INSERT INTO version (table_name, table_version) values ('uacreg','3');
 
diff --git a/utils/kamctl/postgres/auth_db-create.sql b/utils/kamctl/postgres/auth_db-create.sql
@@ -2,15 +2,15 @@ CREATE TABLE subscriber (
     id SERIAL PRIMARY KEY NOT NULL,
     username VARCHAR(64) DEFAULT '' NOT NULL,
     domain VARCHAR(64) DEFAULT '' NOT NULL,
-    password VARCHAR(25) DEFAULT '' NOT NULL,
-    email_address VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1 VARCHAR(64) DEFAULT '' NOT NULL,
-    ha1b VARCHAR(64) DEFAULT '' NOT NULL,
-    rpid VARCHAR(64) DEFAULT NULL,
+    password VARCHAR(64) DEFAULT '' NOT NULL,
+    ha1 VARCHAR(128) DEFAULT '' NOT NULL,
+    ha1b VARCHAR(128) DEFAULT '' NOT NULL,
+    email_address VARCHAR(128) DEFAULT '' NOT NULL,
+    rpid VARCHAR(128) DEFAULT NULL,
     CONSTRAINT subscriber_account_idx UNIQUE (username, domain)
 );
 
 CREATE INDEX subscriber_username_idx ON subscriber (username);
 
-INSERT INTO version (table_name, table_version) values ('subscriber','6');
+INSERT INTO version (table_name, table_version) values ('subscriber','7');
 
diff --git a/utils/kamctl/postgres/uac-create.sql b/utils/kamctl/postgres/uac-create.sql
@@ -2,18 +2,19 @@ CREATE TABLE uacreg (
     id SERIAL PRIMARY KEY NOT NULL,
     l_uuid VARCHAR(64) DEFAULT '' NOT NULL,
     l_username VARCHAR(64) DEFAULT '' NOT NULL,
-    l_domain VARCHAR(128) DEFAULT '' NOT NULL,
+    l_domain VARCHAR(64) DEFAULT '' NOT NULL,
     r_username VARCHAR(64) DEFAULT '' NOT NULL,
-    r_domain VARCHAR(128) DEFAULT '' NOT NULL,
+    r_domain VARCHAR(64) DEFAULT '' NOT NULL,
     realm VARCHAR(64) DEFAULT '' NOT NULL,
     auth_username VARCHAR(64) DEFAULT '' NOT NULL,
     auth_password VARCHAR(64) DEFAULT '' NOT NULL,
-    auth_proxy VARCHAR(64) DEFAULT '' NOT NULL,
+    auth_ha1 VARCHAR(128) DEFAULT '' NOT NULL,
+    auth_proxy VARCHAR(128) DEFAULT '' NOT NULL,
     expires INTEGER DEFAULT 0 NOT NULL,
     flags INTEGER DEFAULT 0 NOT NULL,
     reg_delay INTEGER DEFAULT 0 NOT NULL,
     CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid)
 );
 
-INSERT INTO version (table_name, table_version) values ('uacreg','2');
+INSERT INTO version (table_name, table_version) values ('uacreg','3');
 
diff --git a/utils/kamctl/xhttp_pi/auth_db-mod b/utils/kamctl/xhttp_pi/auth_db-mod
@@ -8,9 +8,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>
@@ -21,9 +21,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>
@@ -37,9 +37,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>

diff --git a/utils/kamctl/xhttp_pi/auth_db-table b/utils/kamctl/xhttp_pi/auth_db-table
@@ -6,8 +6,8 @@
 		<column><field>username</field><type>DB1_STR</type></column>
 		<column><field>domain</field><type>DB1_STR</type></column>
 		<column><field>password</field><type>DB1_STR</type></column>
-		<column><field>email_address</field><type>DB1_STR</type></column>
 		<column><field>ha1</field><type>DB1_STR</type></column>
 		<column><field>ha1b</field><type>DB1_STR</type></column>
+		<column><field>email_address</field><type>DB1_STR</type></column>
 		<column><field>rpid</field><type>DB1_STR</type></column>
 	</db_table>
diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml
@@ -82,9 +82,9 @@
 		<column><field>username</field><type>DB1_STR</type></column>
 		<column><field>domain</field><type>DB1_STR</type></column>
 		<column><field>password</field><type>DB1_STR</type></column>
-		<column><field>email_address</field><type>DB1_STR</type></column>
 		<column><field>ha1</field><type>DB1_STR</type></column>
 		<column><field>ha1b</field><type>DB1_STR</type></column>
+		<column><field>email_address</field><type>DB1_STR</type></column>
 		<column><field>rpid</field><type>DB1_STR</type></column>
 	</db_table>
 	<!-- Declaration of usr_preferences table-->
@@ -822,6 +822,7 @@
 		<column><field>realm</field><type>DB1_STR</type></column>
 		<column><field>auth_username</field><type>DB1_STR</type></column>
 		<column><field>auth_password</field><type>DB1_STR</type></column>
+		<column><field>auth_ha1</field><type>DB1_STR</type></column>
 		<column><field>auth_proxy</field><type>DB1_STR</type></column>
 		<column><field>expires</field><type>DB1_INT</type></column>
 		<column><field>flags</field><type>DB1_INT</type></column>
@@ -1217,9 +1218,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>
@@ -1230,9 +1231,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>
@@ -1246,9 +1247,9 @@
 				<col><field>username</field></col>
 				<col><field>domain</field></col>
 				<col><field>password</field></col>
-				<col><field>email_address</field></col>
 				<col><field>ha1</field></col>
 				<col><field>ha1b</field></col>
+				<col><field>email_address</field></col>
 				<col><field>rpid</field></col>
 			</query_cols>
 		</cmd>
@@ -4117,6 +4118,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>
@@ -4135,6 +4137,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>
@@ -4156,6 +4159,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>

diff --git a/utils/kamctl/xhttp_pi/uac-mod b/utils/kamctl/xhttp_pi/uac-mod
@@ -13,6 +13,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>
@@ -31,6 +32,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>
@@ -52,6 +54,7 @@
 				<col><field>realm</field></col>
 				<col><field>auth_username</field></col>
 				<col><field>auth_password</field></col>
+				<col><field>auth_ha1</field></col>
 				<col><field>auth_proxy</field></col>
 				<col><field>expires</field></col>
 				<col><field>flags</field></col>

diff --git a/utils/kamctl/xhttp_pi/uac-table b/utils/kamctl/xhttp_pi/uac-table
@@ -11,6 +11,7 @@
 		<column><field>realm</field><type>DB1_STR</type></column>
 		<column><field>auth_username</field><type>DB1_STR</type></column>
 		<column><field>auth_password</field><type>DB1_STR</type></column>
+		<column><field>auth_ha1</field><type>DB1_STR</type></column>
 		<column><field>auth_proxy</field><type>DB1_STR</type></column>
 		<column><field>expires</field><type>DB1_INT</type></column>
 		<column><field>flags</field><type>DB1_INT</type></column>