From c940cbe2a7c95855f28019de96d16a2dd4ce69fc Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Fri, 20 Jan 2023 09:10:12 +0100
Subject: [PATCH] Change to hash creation with argon
---
README.md | 8 +++++---
instance-scripts/scripts/atrium.sh | 11 ++++++-----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 07a2560..c3386ae 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,11 @@ After deployment, each resource can be accessed though HTTPS depending on their
- https://code-1.rust-1.daag.alpha.grandlyon.com/
- https://rust-1.daag.alpha.grandlyon.com/
-**User :**
-- Username: abc
-- Password: <Gitlab Stored>
+### Credentials
+
+**Desktop username : abc**
+**Atrium username : admin**
+**Password : <Gitlab Stored>**
## How to add new resources
diff --git a/instance-scripts/scripts/atrium.sh b/instance-scripts/scripts/atrium.sh
index 7ce62cf..56e4de0 100644
--- a/instance-scripts/scripts/atrium.sh
+++ b/instance-scripts/scripts/atrium.sh
@@ -4,7 +4,12 @@
# Install Atrium
#
-export USER_PASSWORD_HASH=$(echo "$(scw-userdata user_password)" | argon2 "$(echo $RANDOM | md5sum | head -c 12)" -i -l 32 -e)
+#
+# Example : Generate user_password Argon2 encoded hash for Atrium
+# echo $(scw-userdata user_password) | argon2 $(echo $RANDOM | md5sum | head -c 12) -id -l 32 -e
+#
+
+export USER_PASSWORD_HASH=$(echo "$(scw-userdata user_password)" | argon2 "$(echo $RANDOM | md5sum | head -c 12)" -id -l 32 -e)
mkdir -p /root/atrium/data && mkdir -p /root/atrium/letsencrypt_cache
curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.yaml -o root/atrium/atrium.yaml
@@ -28,8 +33,4 @@ docker run -d --name atrium \
-v /root/atrium/letsencrypt_cache:/app/letsencrypt_cache \
-v /root/atrium/data:/app/data nicolaspernoud/atrium:latest
-#
-# Example : Generate user_password Argon2 encoded hash for Atrium
-#
-# echo $(scw-userdata user_password) | argon2 $(echo $RANDOM | md5sum | head -c 12) -i -l 32 -e
--
GitLab