From 7dcf7710e5789dfad7985ece4aa1ffea4b3bcbae Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Wed, 2 Oct 2024 11:08:07 +0200
Subject: [PATCH] fix: added condition to bash script, to add the case of
unique instance deployment
---
instance-scripts/config-files/atrium.yaml | 4 ++--
instance-scripts/scripts/atrium.sh | 13 ++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/instance-scripts/config-files/atrium.yaml b/instance-scripts/config-files/atrium.yaml
index 5035109..8bc9632 100644
--- a/instance-scripts/config-files/atrium.yaml
+++ b/instance-scripts/config-files/atrium.yaml
@@ -9,7 +9,7 @@ apps: # optional : applications served by atrium
icon: terminal
color: 4292030255
is_proxy: true
- host: terminal-%atrium_count_index%
+ host: terminal%-atrium_count_index%
target: localhost:8081
secured: true
login: admin
@@ -20,4 +20,4 @@ users:
- login: admin
password: %user_password_hash%
roles:
- - ADMINS
\ No newline at end of file
+ - ADMINS
diff --git a/instance-scripts/scripts/atrium.sh b/instance-scripts/scripts/atrium.sh
index f071770..ca57179 100644
--- a/instance-scripts/scripts/atrium.sh
+++ b/instance-scripts/scripts/atrium.sh
@@ -5,6 +5,7 @@
#
export USER_PASSWORD_HASH=$(echo -n "$(scw-userdata user_password)" | argon2 "$(echo $RANDOM | md5sum | head -c 12)" -id -l 32 -e)
+export ATRIUM_COUNT_INDEX=$(scw-userdata atrium_count_index)
mkdir -p /root/atrium/data && mkdir -p /root/atrium/letsencrypt_cache
curl https://forge.grandlyon.com/systemes-dinformation/alpha/pocs/cloud-machinist/cloud-machinist-templates/scaleway-instances-template/-/raw/main/instance-scripts/config-files/atrium.yaml -o root/atrium/atrium.yaml
@@ -12,7 +13,14 @@ curl https://forge.grandlyon.com/systemes-dinformation/alpha/pocs/cloud-machinis
sed -i "s|%atrium_hostname%|$(scw-userdata atrium_hostname)|g" /root/atrium/atrium.yaml
sed -i "s|%project_domain%|$(scw-userdata project_domain)|g" /root/atrium/atrium.yaml
sed -i "s|%atrium_letsencrypt_email%|$(scw-userdata atrium_letsencrypt_email)|g" /root/atrium/atrium.yaml
-sed -i "s|%atrium_count_index%|$(scw-userdata atrium_count_index)|g" /root/atrium/atrium.yaml
+if [ "$ATRIUM_COUNT_INDEX" -eq 0 ]; then
+ sed -i "s|%-atrium_count_index%||g" /root/atrium/atrium.yaml
+ echo "test1"
+else
+ # Apply this if the value is greater than 0
+ sed -i "s|%-atrium_count_index%|-$(scw-userdata atrium_count_index)|g" /root/atrium/atrium.yaml
+ echo "test2"
+fi
sed -i "s|%user_password_hash%|$USER_PASSWORD_HASH|g" /root/atrium/atrium.yaml
sed -i "s|%user_password%|$(scw-userdata user_password)|g" /root/atrium/atrium.yaml
chown -Rf 1000:1000 /root/atrium
@@ -29,3 +37,6 @@ docker run -d --name atrium \
-v /root/atrium/data:/app/data nicolaspernoud/atrium:latest
+
+
+
--
GitLab