From 47a061c189a34cf309a705578d649f8f5a2d32dc Mon Sep 17 00:00:00 2001 From: Nathan Rodet <nrodet@grandlyon.com> Date: Thu, 30 Mar 2023 13:30:54 +0200 Subject: [PATCH] Patch script dependancies --- instance-scripts/cloud-init.yml | 6 +++--- instance-scripts/scripts/atrium.sh | 2 +- instance-scripts/scripts/ttyd.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml index 98a97e7..376da39 100644 --- a/instance-scripts/cloud-init.yml +++ b/instance-scripts/cloud-init.yml @@ -19,12 +19,12 @@ 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/scaleway-instances-template/-/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/scaleway-instances-template/-/raw/main/instance-scripts/scripts/atrium.sh | bash" # # Install ttyd # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/ttyd.sh | bash" \ No newline at end of file + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/scaleway-instances-template/-/raw/main/instance-scripts/scripts/ttyd.sh | bash" \ No newline at end of file diff --git a/instance-scripts/scripts/atrium.sh b/instance-scripts/scripts/atrium.sh index 42a9612..9308a46 100644 --- a/instance-scripts/scripts/atrium.sh +++ b/instance-scripts/scripts/atrium.sh @@ -7,7 +7,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/scaleway-instances-template/-/raw/main/instance-scripts/config-files/atrium.yaml -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/ttyd.sh b/instance-scripts/scripts/ttyd.sh index eeb2c71..24dce59 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/pocs/scaleway-instances-template/-/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