From bca9264ce94a4b316cb351e2763992294c4eea94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri@k-space.ee>
Date: Sun, 4 Apr 2021 08:58:45 +0000
Subject: [PATCH] Rolled out in prod

---
 .env               |   3 ---
 .gitignore         |   1 +
 .overnodebundle    | Bin 0 -> 20480 bytes
 README.md          |   9 +++++++++
 docker-compose.yml |  12 +++++-------
 main.py            |   9 ++++-----
 overnode.yml       |   6 ++++++
 7 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 .env
 create mode 100644 .gitignore
 create mode 100644 .overnodebundle
 create mode 100644 README.md
 create mode 100644 overnode.yml

diff --git a/.env b/.env
deleted file mode 100644
index 3b6d269..0000000
--- a/.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# MONGO_URI=mongodb://root:salakala@localhost:27017/?replicaSet=kspace-mongo-set
-MONGO_URI=mongodb://root:salakala@localhost:27017
-DOORBOY_SECRET=doorboy_secret
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4c49bd7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/.overnodebundle b/.overnodebundle
new file mode 100644
index 0000000000000000000000000000000000000000..244cdcee54a9b14b3e03a41a0fde4bbba26526c8
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..5c8b486
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+# Deploying
+
+```
+docker build -t 172.20.40.1:5000/doorboy:latest .
+docker push 172.20.40.1:5000/doorboy:latest
+overnode pull
+overnode up
+```
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 521587d..be2917b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,14 +5,12 @@ networks:
     external: true
 
 services:
-  doorboy_proxy:
-    hostname: doorboy.infra.k-space.ee
+  app:
+    image: 172.20.40.1:5000/doorboy:latest
+    hostname: replica${OVERNODE_ID}.doorboy.infra.k-space.ee
     restart: unless-stopped
     env_file: .env
     networks:
       infra:
-        ipv4_address: 172.21.99.97
-    build:
-      context: .
-
-
+        ipv4_address: 172.21.57.${OVERNODE_ID}
+        ipv6_address: 2001:bb8:4008:21:57::${OVERNODE_ID}
diff --git a/main.py b/main.py
index 886d0fe..ac5bc27 100644
--- a/main.py
+++ b/main.py
@@ -9,9 +9,8 @@ import const
 
 app = Sanic(__name__)
 
-#mongodb = MongoClient('mongodb://172.21.27.1,172.21.27.2,172.21.27.3:27017/', replicaSet="kspace-mongo-set").kspace_accounting
 mongodb = AsyncIOMotorClient(const.MONGO_URI)
-mongodb = mongodb.get_default_database()
+db = mongodb.get_default_database()
 
 DOORBOY_SECRET = os.environ["DOORBOY_SECRET"]
 
@@ -22,10 +21,10 @@ async def view_doorboy_uids(request):
     if request.headers.get('KEY') != DOORBOY_SECRET:
         return text("how about no")
     allowed_names = []
-    async for obj in mongodb.member.find({"enabled": True}):
+    async for obj in db.member.find({"enabled": True}):
         allowed_names.append(obj["_id"])
     allowed_uids = []
-    async for obj in mongodb.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }):
+    async for obj in db.inventory.find({"token.uid_hash": {"$exists":True}, "inventory.owner_id": {"$exists":True}, "token.enabled": True}, {"inventory.owner_id": True, "token.uid_hash": True }):
         if obj["inventory"].pop("owner_id") in allowed_names:
             del obj["_id"]
             del obj["inventory"]
@@ -50,7 +49,7 @@ async def view_longpoll(request):
             }
         ]
         try:
-            async with mongodb.eventlog.watch(pipeline) as stream:
+            async with db.eventlog.watch(pipeline) as stream:
                 await response.write("data: watch-stream-opened\n\n")
                 async for event in stream:
                     if event["fullDocument"].get("type") == "open-door":
diff --git a/overnode.yml b/overnode.yml
new file mode 100644
index 0000000..31a2ebe
--- /dev/null
+++ b/overnode.yml
@@ -0,0 +1,6 @@
+id: doorboy
+
+version: 3.7
+
+app:
+    docker-compose.yml: 1, 2, 3