zf

commit c6cc1dc3515e5e20c5d2131de0ef1ded411a7588
parent c7834017cf3f8be148a6b8f55e977d4c25b88359
Author: srfsh <dev@srf.sh>
Date:   Tue, 19 Jul 2022 13:14:59 +0300

devop: tiny fix

Diffstat:
M
devop/.docker-compose.templ
 | 
8
+++++---
M
mann
 | 
5
++---

2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/devop/.docker-compose.templ b/devop/.docker-compose.templ
@@ -28,14 +28,16 @@ services:
     ports:
       - 8000:8000
     environment:
+      ADMIN_KEY: $ADMIN_KEY
+
       DB_HOST: db
       DB_NAME: &db_name zenflows
       DB_USER: &db_user zenflows_dbuser
       DB_PASS: &db_pass $DB_PASS
       # DB_PORT: 5432
 
-      ROOM_ENDPOINT: zvmlet:3000
-      ROOM_SALT: $ROOM_SALT
+      ROOM_HOST: zvmlet
+      ROOM_PORT: &room_port 3000
     depends_on:
       - zvmlet
       - db
@@ -57,6 +59,6 @@ services:
       context: ../
       dockerfile: devop/zvmlet-dockerfile
     environment:
-      HTTP_PORT: 3000
+      HTTP_PORT: *room_port
     volumes:
       - ../zencode:/restroom-mw/contracts:ro
diff --git a/mann b/mann
@@ -259,9 +259,8 @@ cmd_devop_setup() {
 	if test -e devop/docker-compose.yml ; then
 		warn "the file 'devop/docker-compose.yml' already exists; skipping"
 	else
-		salt=$(openssl rand -hex 64)
-		pass=$(openssl rand -hex 16)
-		sed 's,$ROOM_SALT,'"$salt"',;s,$DB_PASS,'"$pass"',' devop/.docker-compose.templ >devop/docker-compose.yml
+		key=$(openssl rand -hex 16)
+		sed s,\$ADMIN_KEY,"$key", devop/.docker-compose.templ >devop/docker-compose.yml
 		warn "the 'devop/docker-compose.yml' file is generated, please edit it to suit your needs"
 	fi
 }