Misc changes.

git-svn-id: svn://svn.zabbix.com/trunk@3389 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 22 insertions, 22 deletions

diff --git a/create/data/nodes.sql b/create/data/nodes.sql
index 12c4dfe4..8d48980b 100644
--- a/create/data/nodes.sql
+++ b/create/data/nodes.sql
@@ -1,4 +1,4 @@
-connect 1_3_rights7;
+connect node7;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 1, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
@@ -11,7 +11,7 @@ insert into events values (700000000000001, 700000000000003, 123456789, 0, 0);
 insert into events values (700000000000002, 700000000000012, 123456789, 0, 0);
 insert into events values (700000000000003, 700000000000023, 123456789, 0, 0);
 insert into events values (700000000000004, 700000000000045, 123456789, 0, 0);
-connect 1_3_rights6;
+connect node6;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 1, 5);
@@ -21,7 +21,7 @@ insert into nodes values (3, "Latvia", 2, "127.0.0.1", 15053, 30, 365, 0, 0, 0,
 insert into nodes values (2, "Riga",   2, "127.0.0.1", 15052, 30, 365, 0, 0, 0, 3);
 insert into nodes values (1, "Dpils",  2, "127.0.0.1", 15051, 30, 365, 0, 0, 0, 3);
 insert into events values (600000000000001, 600000000000103, 123456789, 1, 0);
-connect 1_3_rights5;
+connect node5;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
@@ -31,7 +31,7 @@ insert into nodes values (3, "Latvia", 2, "127.0.0.1", 15053, 30, 365, 0, 0, 0,
 insert into nodes values (2, "Riga",   2, "127.0.0.1", 15052, 30, 365, 0, 0, 0, 3);
 insert into nodes values (1, "Dpils",  2, "127.0.0.1", 15051, 30, 365, 0, 0, 0, 3);
 insert into events values (500000000000001, 500000000000122, 123456789, 1, 0);
-connect 1_3_rights4;
+connect node4;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
@@ -40,7 +40,7 @@ insert into nodes values (4, "Zabbix", 2, "127.0.0.1", 15054, 30, 365, 0, 0, 1,
 insert into nodes values (3, "Latvia", 2, "127.0.0.1", 15053, 30, 365, 0, 0, 0, 4);
 insert into nodes values (2, "Riga",   2, "127.0.0.1", 15052, 30, 365, 0, 0, 0, 3);
 insert into nodes values (1, "Dpils",  2, "127.0.0.1", 15051, 30, 365, 0, 0, 0, 3);
-connect 1_3_rights3;
+connect node3;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
@@ -49,7 +49,7 @@ insert into nodes values (4, "Zabbix", 2, "127.0.0.1", 15054, 30, 365, 0, 0, 0,
 insert into nodes values (3, "Latvia", 2, "127.0.0.1", 15053, 30, 365, 0, 0, 1, 4);
 insert into nodes values (2, "Riga",   2, "127.0.0.1", 15052, 30, 365, 0, 0, 0, 3);
 insert into nodes values (1, "Dpils",  2, "127.0.0.1", 15051, 30, 365, 0, 0, 0, 3);
-connect 1_3_rights2;
+connect node2;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
@@ -58,7 +58,7 @@ insert into nodes values (4, "Zabbix", 2, "127.0.0.1", 15054, 30, 365, 0, 0, 0,
 insert into nodes values (3, "Latvia", 2, "127.0.0.1", 15053, 30, 365, 0, 0, 0, 4);
 insert into nodes values (2, "Riga",   2, "127.0.0.1", 15052, 30, 365, 0, 0, 1, 3);
 insert into nodes values (1, "Dpils",  2, "127.0.0.1", 15051, 30, 365, 0, 0, 0, 3);
-connect 1_3_rights1;
+connect node1;
 delete from nodes;
 insert into nodes values (7, "Cologne",2, "127.0.0.1", 15057, 30, 365, 0, 0, 0, 5);
 insert into nodes values (6, "Berlin", 2, "127.0.0.1", 15056, 30, 365, 0, 0, 0, 5);
diff --git a/create/data/recreate.sh b/create/data/recreate.sh
index 78fb6c1d..74994922 100755
--- a/create/data/recreate.sh
+++ b/create/data/recreate.sh
@@ -1,12 +1,12 @@
-db_name="1_3_rights"
+db_name="node"
 local_id="1"
 
-#echo Killing servers
-#killall zabbix_server >/dev/null 2>/dev/null
-#sleep 1
-#killall -9 zabbix_server >/dev/null 2>/dev/null
-#echo Removing log files
-#rm ~zabbix/logs/node*
+echo Killing servers
+killall zabbix_server >/dev/null 2>/dev/null
+sleep 1
+killall -9 zabbix_server >/dev/null 2>/dev/null
+echo Removing log files
+rm ~zabbix/logs/node*
 
 echo Generate Database schems
 cd ../schema
@@ -51,10 +51,10 @@ for i in 1 2 3 4 5 6 7; do
 	echo "update images set imageid=imageid+0000100000000000000*$i"|mysql -uroot $db_name$i
 done
 
-echo Importing MySQL databases
-for i in 2 3 4 5 6 7; do
-	mysqldump --add-drop-table=false --add-locks=FALSE --no-create-db=FALSE --create-options=FALSE --no-create-info=TRUE --ignore-table="$db_name$i.help_items" --ignore-table="$db_name$i.nodes" -uroot $db_name$i | mysql -f -uroot $db_name$local_id
-done
+#echo Importing MySQL databases
+#for i in 2 3 4 5 6 7; do
+#	mysqldump --add-drop-table=false --add-locks=FALSE --no-create-db=FALSE --create-options=FALSE --no-create-info=TRUE --ignore-table="$db_name$i.help_items" --ignore-table="$db_name$i.nodes" -uroot $db_name$i | mysql -f -uroot $db_name$local_id
+#done
 
 #echo Making MySQL server
 #cd ../..
@@ -62,8 +62,8 @@ done
 #make clean >/dev/null
 #make install >/dev/null
 #cd - >/dev/null
-#echo Staring servers
-#for i in 1 2 3 4 5 6 7; do
-#	../../bin/zabbix_server -c /etc/zabbix/$db_name$i.conf >/dev/null
-#done
+echo Staring servers
+for i in 1 2 3 4 5 6 7; do
+	../../bin/zabbix_server -c /etc/zabbix/$db_name$i.conf >/dev/null
+done