[sr-dev] git:master:c7c68bb5: utils: revert commit to two files accidentally introduced in commit 61eb1ac7

Module: kamailio Branch: master Commit: c7c68bb506661a7fd97a9e0b8487d074dbbb3ee1 URL: https://github.com/kamailio/kamailio/commit/c7c68bb506661a7fd97a9e0b8487d07… Author: Henning Westerholt &lt;hw(a)kamailio.org&gt; Committer: Henning Westerholt &lt;hw(a)kamailio.org&gt; Date: 2019-02-18T20:54:03+01:00 utils: revert commit to two files accidentally introduced in commit 61eb1ac7 --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/c7c68bb506661a7fd97a9e0b8487d07… Patch: https://github.com/kamailio/kamailio/commit/c7c68bb506661a7fd97a9e0b8487d07… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 0c00d793c3..d6e927fe84 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -15,7 +15,7 @@ # # If you want to setup a database with kamdbctl, you must at least specify # this parameter. -DBENGINE=MYSQL +# DBENGINE=MYSQL ## database host # DBHOST=localhost diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index 7993b4cc2f..81cda70f50 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -219,17 +219,6 @@ <column><field>attrs</field><type>DB1_STR</type></column> <column><field>description</field><type>DB1_STR</type></column> </db_table> - <!-- Declaration of domainpolicy table--> - <db_table id="domainpolicy"> - <table_name>domainpolicy</table_name> - <db_url_id>mysql</db_url_id> - <column><field>id</field><type>DB1_INT</type></column> - <column><field>rule</field><type>DB1_STR</type></column> - <column><field>type</field><type>DB1_STR</type></column> - <column><field>att</field><type>DB1_STR</type></column> - <column><field>val</field><type>DB1_STR</type></column> - <column><field>description</field><type>DB1_STR</type></column> - </db_table> <!-- Declaration of domain table--> <db_table id="domain"> <table_name>domain</table_name> @@ -250,6 +239,17 @@ <column><field>value</field><type>DB1_STR</type></column> <column><field>last_modified</field><type>DB1_DATETIME</type></column> </db_table> + <!-- Declaration of domainpolicy table--> + <db_table id="domainpolicy"> + <table_name>domainpolicy</table_name> + <db_url_id>mysql</db_url_id> + <column><field>id</field><type>DB1_INT</type></column> + <column><field>rule</field><type>DB1_STR</type></column> + <column><field>type</field><type>DB1_STR</type></column> + <column><field>att</field><type>DB1_STR</type></column> + <column><field>val</field><type>DB1_STR</type></column> + <column><field>description</field><type>DB1_STR</type></column> + </db_table> <!-- Declaration of dr_gateways table--> <db_table id="dr_gateways"> <table_name>dr_gateways</table_name>