From 7d18ce565c3196ceee535423068a57247046c60e Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Fri, 20 Jan 2023 11:30:18 +0100
Subject: [PATCH] Corrected default password issue with atrium password hashing
---
README.md | 4 ++--
instance-scripts/config-files/atrium.yaml | 6 +++---
instance-scripts/scripts/ttyd.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index b246625..860591d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# Alpha Project Manager
+# Labo Rust
-An Infrastructure as Code manager to deploy lab infrastructure and configure instances. Working with Atrium, Gitlab CI, Terraform, Cloud-init and Scaleway.
+Infrastructure as Code project to deploy lab infrastructure and configure instances. Working with Atrium, Gitlab CI, Terraform, Cloud-init, bash scripts and Scaleway.
### How does it work ?
diff --git a/instance-scripts/config-files/atrium.yaml b/instance-scripts/config-files/atrium.yaml
index af50a7c..aaccd45 100644
--- a/instance-scripts/config-files/atrium.yaml
+++ b/instance-scripts/config-files/atrium.yaml
@@ -5,21 +5,21 @@ letsencrypt_email: %atrium_letsencrypt_email%
tls_mode: Auto
apps: # optional : applications served by atrium
- id: 1
- name: Code %atrium_count_index%
+ name: Code
icon: web_asset
color: 4292030255
is_proxy: true
host: code-%atrium_count_index%
target: localhost:8080
- id: 2
- name: Desktop %atrium_count_index%
+ name: Desktop
icon: web_asset
color: 4292030255
is_proxy: true
host: desktop-%atrium_count_index%
target: localhost:8081
- id: 3
- name: Terminal %atrium_count_index%
+ name: Terminal
icon: terminal
color: 4292030255
is_proxy: true
diff --git a/instance-scripts/scripts/ttyd.sh b/instance-scripts/scripts/ttyd.sh
index 45b88f5..8ca8e5c 100644
--- a/instance-scripts/scripts/ttyd.sh
+++ b/instance-scripts/scripts/ttyd.sh
@@ -5,7 +5,7 @@
#
mkdir -p /root/ttyd
-curl https://github.com/tsl0922/ttyd/releases/download/1.7.2/ttyd.x86_64 -o root/ttyd/ttyd.x86_64
+curl https://github.com/tsl0922/ttyd/releases/download/1.7.3/ttyd.x86_64 -o root/ttyd/ttyd.x86_64
chmod +x /root/ttyd/ttyd.x86_64
curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/ttyd.service -o etc/systemd/system/ttyd.service
sed -i "s|%user_password%|$(scw-userdata user_password)|g" /etc/systemd/system/ttyd.service
--
GitLab