From 1c84794f7839a8ceb2d6c0af68358766ed3dba0f Mon Sep 17 00:00:00 2001 From: Nathan Rodet <nrodet@grandlyon.com> Date: Thu, 30 Mar 2023 13:20:26 +0200 Subject: [PATCH] patch scripts dependancies --- instance-scripts/cloud-init.yml | 12 ++++++------ instance-scripts/scripts/atrium.sh | 2 +- instance-scripts/scripts/code-server.sh | 2 +- instance-scripts/scripts/ttyd.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml index d34d7ff..e0ca27f 100644 --- a/instance-scripts/cloud-init.yml +++ b/instance-scripts/cloud-init.yml @@ -20,27 +20,27 @@ runcmd: # # Install Docker # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/docker.sh | bash" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/docker.sh | bash" # # Install Atrium # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/atrium.sh | bash" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/atrium.sh | bash" # # Install Code Server # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/code-server.sh | bash" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/code-server.sh | bash" # # Install Webtop # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/webtop.sh | sh" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/webtop.sh | sh" # # Install ttyd # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/ttyd.sh | bash" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/ttyd.sh | bash" # # Install Rust # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/rust.sh | bash" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/rust.sh | bash" # # Install Repository # diff --git a/instance-scripts/scripts/atrium.sh b/instance-scripts/scripts/atrium.sh index b95a734..8ba4410 100644 --- a/instance-scripts/scripts/atrium.sh +++ b/instance-scripts/scripts/atrium.sh @@ -12,7 +12,7 @@ export USER_PASSWORD_HASH=$(echo -n "$(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 +curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/config-files/atrium.yaml?inline=false -o root/atrium/atrium.yaml 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 diff --git a/instance-scripts/scripts/code-server.sh b/instance-scripts/scripts/code-server.sh index 8c267c0..4027168 100644 --- a/instance-scripts/scripts/code-server.sh +++ b/instance-scripts/scripts/code-server.sh @@ -5,7 +5,7 @@ # mkdir -p /root/.config/code-server/ -curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/config.yaml -o root/.config/code-server/config.yaml +curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/config-files/config.yaml -o root/.config/code-server/config.yaml sed -i "s/%user_password%/$(scw-userdata user_password)/g" /root/.config/code-server/config.yaml curl -fsSL https://code-server.dev/install.sh | sh diff --git a/instance-scripts/scripts/ttyd.sh b/instance-scripts/scripts/ttyd.sh index eeb2c71..6279d62 100644 --- a/instance-scripts/scripts/ttyd.sh +++ b/instance-scripts/scripts/ttyd.sh @@ -7,7 +7,7 @@ mkdir -p /root/ttyd curl -k -L -s 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 +curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/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 systemctl enable ttyd.service && systemctl start ttyd.service -- GitLab