zf

commit 843d84556553ab2600c2a620e31f4a3b252574fe
parent 3f665c9c8f2488014333053dc21d71a553f3e074
Author: srfsh <dev@srf.sh>
Date:   Tue, 26 Jul 2022 17:22:51 +0300

mann: generate ROOM_PASS

Diffstat:
M
mann
 | 
12
++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/mann b/mann
@@ -182,7 +182,8 @@ cmd_env_setup() {
 		warn "the file 'conf/env.sh' already exists; skipping"
 	else
 		key=$(openssl rand -hex 64)
-		sed s,\$ADMIN_KEY,"$key", conf/.env.templ >conf/env.sh
+		pass=$(openssl rand -hex 64)
+		sed 's,$ADMIN_KEY,'"$admin_key"', ; s,$ROOM_PASS,'"$pass"',' conf/.env.templ >conf/env.sh
 		warn "the 'conf/env.sh' file is generated, please edit it to suit your needs"
 	fi
 }
@@ -267,9 +268,12 @@ cmd_devop_setup() {
 	if test -e devop/docker-compose.yml ; then
 		warn "the file 'devop/docker-compose.yml' already exists; skipping"
 	else
-		pass=$(openssl rand -hex 16)
-		key=$(openssl rand -hex 64)
-		sed 's,$ADMIN_KEY,'"$key"', ; s,$DB_PASS,'"$pass"',' devop/.docker-compose.templ >devop/docker-compose.yml
+		admin_key=$(openssl rand -hex 64)
+		db_pass=$(openssl rand -hex 16)
+		room_key=$(openssl rand -hex 64)
+		sed 's,$ADMIN_KEY,'"$admin_key"', ;
+		     s,$DB_PASS,'"$db_pass"', ;
+		     s,$ROOM_PASS,'"$room_pass"',' 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
 }