浏览代码

utils: revert commit to two files accidentally introduced in commit 61eb1ac7

Henning Westerholt 6 年之前
父节点
当前提交
c7c68bb506
共有 2 个文件被更改,包括 12 次插入12 次删除
  1. 1 1
      utils/kamctl/kamctlrc
  2. 11 11
      utils/kamctl/xhttp_pi/pi_framework.xml

+ 1 - 1
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

+ 11 - 11
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>