From 4a435d5b28b7e88b14e23c224465f7cedc25bce7 Mon Sep 17 00:00:00 2001
From: voje <kristjan.voje@gmail.com>
Date: Mon, 22 Apr 2019 20:32:06 +0200
Subject: [PATCH] moving to local

---
 data/kres_json_folder_link                 | 2 +-
 data/kres_json_folder_link_prod            | 1 -
 data/kres_json_folder_link_t420            | 1 +
 data/kres_xml_folder_link                  | 2 +-
 dockerfiles/python-env/Makefile            | 9 +++++----
 src/backend_flask/app.py                   | 3 ++-
 src/backend_flask/conf_files/dev_conf.yaml | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 120000 data/kres_json_folder_link_prod
 create mode 120000 data/kres_json_folder_link_t420

diff --git a/data/kres_json_folder_link b/data/kres_json_folder_link
index 965aba4..9c386ed 120000
--- a/data/kres_json_folder_link
+++ b/data/kres_json_folder_link
@@ -1 +1 @@
-/home/kristjan/kres_data/payload/kres_json/
\ No newline at end of file
+/home/kristjan/workdir/final_json/
\ No newline at end of file
diff --git a/data/kres_json_folder_link_prod b/data/kres_json_folder_link_prod
deleted file mode 120000
index 9c386ed..0000000
--- a/data/kres_json_folder_link_prod
+++ /dev/null
@@ -1 +0,0 @@
-/home/kristjan/workdir/final_json/
\ No newline at end of file
diff --git a/data/kres_json_folder_link_t420 b/data/kres_json_folder_link_t420
new file mode 120000
index 0000000..965aba4
--- /dev/null
+++ b/data/kres_json_folder_link_t420
@@ -0,0 +1 @@
+/home/kristjan/kres_data/payload/kres_json/
\ No newline at end of file
diff --git a/data/kres_xml_folder_link b/data/kres_xml_folder_link
index b3fbfac..b5b31cd 120000
--- a/data/kres_xml_folder_link
+++ b/data/kres_xml_folder_link
@@ -1 +1 @@
-/home/kristjan/kres_data/payload/kres_xml/
\ No newline at end of file
+/home/kristjan/kres_mount/kres_parsed/tei/
\ No newline at end of file
diff --git a/dockerfiles/python-env/Makefile b/dockerfiles/python-env/Makefile
index 3d4d27f..339cc75 100644
--- a/dockerfiles/python-env/Makefile
+++ b/dockerfiles/python-env/Makefile
@@ -11,13 +11,14 @@ run:
 	- docker rm $(CNNAME)
 	docker run \
     -it \
-	-v /home/${USER}:/home/${USER} \
-	--user $(shell id -u):$(shell id -g) \
-	-v /etc/passwd:/etc/passwd \
-	-v /etc/group:/etc/group \
     -v $(MAKE_ROOT):/project \
 	-w /project \
 	--net host \
 	--name $(CNNAME) \
 	$(IMAGE_NAME) \
 	/bin/bash
+
+# --user $(shell id -u):$(shell id -g) \
+# -v /home/${USER}:/home/${USER} \
+# -v /etc/passwd:/etc/passwd \
+# -v /etc/group:/etc/group \
diff --git a/src/backend_flask/app.py b/src/backend_flask/app.py
index e73c7bc..98f3be6 100644
--- a/src/backend_flask/app.py
+++ b/src/backend_flask/app.py
@@ -502,7 +502,7 @@ if __name__ == "__main__":
         username=args.dbuser,
         password=args.dbpass,
         authSource="valdb",
-        authMechanism='SCRAM-SHA-256'
+        authMechanism='SCRAM-SHA-1'
     )
     valdb = client.valdb
 
@@ -517,3 +517,4 @@ if __name__ == "__main__":
     log.info("[*] Starting app.py with config:\n{}".format(config))
 
     app.run(host=str(config["host"]), port=int(config["port"]))
+
diff --git a/src/backend_flask/conf_files/dev_conf.yaml b/src/backend_flask/conf_files/dev_conf.yaml
index 31dd233..1f21a14 100644
--- a/src/backend_flask/conf_files/dev_conf.yaml
+++ b/src/backend_flask/conf_files/dev_conf.yaml
@@ -1,6 +1,6 @@
 ---
 debug: True
-port: 5004
+port: 8084
 host: localhost
 logfile: "/var/log/valency_backend.log"
 ---