From 8fd2a7789de3bf05230914c3841bde49aa647604 Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Wed, 14 Jun 2023 09:02:34 +0200
Subject: [PATCH] Improved setting up piler

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 tests/setup.inc | 24 ++++++------------------
 tests/setup.sql | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 tests/setup.sql

diff --git a/tests/setup.inc b/tests/setup.inc
index f0240373..4fbd370f 100644
--- a/tests/setup.inc
+++ b/tests/setup.inc
@@ -7,8 +7,7 @@ export CONTAINERS=( "$NODE_GUI" "${NODE_WORKERS[@]}" "$SMTP_GW" "$SINGLE_SERVER"
 setup() {
    destroy_containers
    launch_containers
-   create_rules "piler1"
-   add_data_officer "piler1"
+   setup_piler
 }
 
 cleanup_package() {
@@ -60,24 +59,13 @@ launch_containers2() {
    ###cleanup_package "$PACKAGE"
 }
 
-create_rules() {
+setup_piler() {
    local container="$1"
 
-   echo 'echo "insert into domain (domain, mapped) values(\"fictive.com\",\"fictive.com\"),(\"address.com\",\"address.com\"),(\"acts.hu\",\"acts.hu\"),(\"gtsce.com\",\"gtsce.com\"),(\"datanet.hu\",\"datanet.hu\"),(\"gtsdatanet.hu\",\"gtsdatanet.hu\"),(\"gts.hu\",\"gts.hu\"),(\"aaa.fu\",\"aaa.fu\")"| mysql --defaults-file=/etc/piler/.my.cnf piler' | docker exec -i "$container" sh
+   pushd "${WORKSPACE}/${PROJECT_ID}/tests"
 
-   echo 'echo "insert into archiving_rule (subject) values (\"Android táblagép\")"| mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
-   echo 'echo "insert into archiving_rule (\`from\`) values (\"@gmail.com\")"| mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
-   echo 'echo "insert into archiving_rule (\`from\`,attachment_type, _attachment_size, attachment_size) values (\"finderis.co.ua\", \"image\", \">\", 100000)"|mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
-   echo 'echo "insert into archiving_rule (\`to\`) values (\"undisclosed-recipients\")"|mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
-   echo 'echo "insert into import (\`type\`, username, password, server) values (\"imap-ssl\", \"sanyi@aaa.fu\", \"abcde123\", \"imap.aaa.fu\")"|mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
+   docker cp setup.sql "${container}:/tmp"
+   docker exec "$container" /usr/local/bin/setup-piler.sh
 
-   echo 'echo "update user set password=\"\$6\$GKL00T\$8jqoFOe3PyAbOCLwKB7JwndwC.IinHrZRkdoQDZUc8vybZ88sA2qomlz5JceNif8fFpkGzZ03ilvQa7tqQx0v1\""| mysql --defaults-file=/etc/piler/.my.cnf piler'|docker exec -i "$container" sh
-
-   docker exec "$container" /etc/init.d/rc.piler reload
-}
-
-add_data_officer() {
-   local container="$1"
-   echo 'echo "insert into user (uid, username, realname, password, domain, dn, isadmin) values(2, \"dataofficer\", \"Data officer\", \"\$6\$rX285LfP\$ZxhlacbzKuCcqkaizzBu8SAiYb6.f8K4Us08nUHwSpWMQkNhw4o2rmfKXoTfaM4rnBHUYVK1N4IfBsqN8CAtS/\", \"local\", \"*\", 4)"| mysql --defaults-file=/etc/piler/.my.cnf piler' | docker exec -i "$container" sh
-   echo 'echo "insert into email (uid, email) values(2, \"do@local\")"| mysql --defaults-file=/etc/piler/.my.cnf piler' | docker exec -i "$container" sh
+   popd
 }
diff --git a/tests/setup.sql b/tests/setup.sql
new file mode 100644
index 00000000..5d8c4dee
--- /dev/null
+++ b/tests/setup.sql
@@ -0,0 +1,14 @@
+use piler;
+
+insert into domain (domain, mapped) values("fictive.com","fictive.com"),("address.com","address.com"),("acts.hu","acts.hu"),("gtsce.com","gtsce.com"),("datanet.hu","datanet.hu"),("gtsdatanet.hu","gtsdatanet.hu"),("gts.hu","gts.hu"),("aaa.fu","aaa.fu");
+
+insert into archiving_rule (subject) values ("Android táblagép");
+insert into archiving_rule (`from`) values ("@gmail.com");
+insert into archiving_rule (`from`,attachment_type, _attachment_size, attachment_size) values ("finderis.co.ua", "image", ">", 100000);
+insert into archiving_rule (`to`) values ("undisclosed-recipients");
+insert into import (`type`, username, password, server) values ("imap-ssl", "sanyi@aaa.fu", "abcde123", "imap.aaa.fu");
+
+update user set password="$6$GKL00T$8jqoFOe3PyAbOCLwKB7JwndwC.IinHrZRkdoQDZUc8vybZ88sA2qomlz5JceNif8fFpkGzZ03ilvQa7tqQx0v1";
+
+insert into user (uid, username, realname, password, domain, dn, isadmin) values(2, "dataofficer", "Data officer", "$6$rX285LfP$ZxhlacbzKuCcqkaizzBu8SAiYb6.f8K4Us08nUHwSpWMQkNhw4o2rmfKXoTfaM4rnBHUYVK1N4IfBsqN8CAtS/", "local", "*", 4);
+insert into email (uid, email) values(2, "do@local");