From dc54b28e955486adf3c61e124895c2a2d6443ffd Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Fri, 13 Jan 2023 11:05:43 +0100
Subject: [PATCH] Working scripts configuration

---
 instance-scripts/cloud-init.yml    | 53 +++---------------------------
 instance-scripts/scripts/webtop.sh |  2 ++
 2 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml
index 744e79e..f4fdcaa 100644
--- a/instance-scripts/cloud-init.yml
+++ b/instance-scripts/cloud-init.yml
@@ -9,41 +9,6 @@ packages:
   - curl
   - git
 
-write_files:
-#
-# Atrium config file
-#
-  - content: |
-      hostname: %atrium_hostname%.daag.alpha.grandlyon.com
-      debug_mode: false
-      letsencrypt_email: %atrium_letsencrypt_email%
-      tls_mode: Auto
-      apps: # optional : applications served by atrium
-        - id: 1
-          name: Code %atrium_count_index%
-          icon: web_asset
-          color: 4292030255
-          is_proxy: true
-          host: code-%atrium_count_index%
-          target: localhost:8080
-        - id: 2
-          name: Desktop %atrium_count_index%
-          icon: web_asset
-          color: 4292030255
-          is_proxy: true
-          host: desktop-%atrium_count_index%
-          target: localhost:8081
-    path: /root/atrium.yaml
-#
-# Code-server config file
-#
-  - content: |
-      bind-addr: 0.0.0.0:8080
-      auth: password
-      password: %user_password%
-      cert: false
-    path: /root/config.yaml
-
 runcmd:
 #
 # Install Rust
@@ -56,27 +21,17 @@ runcmd:
 #
 # Install Atrium
 #
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.yaml -o atrium.yaml"
   - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.sh | bash"
-  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.sh | bash"
-#
-# Run Atrium Container
-#
-  - "docker run -d --name atrium --restart unless-stopped --net=host -v /root/atrium/atrium.yaml:/app/atrium.yaml -v /root/atrium/letsencrypt_cache:/app/letsencrypt_cache -v /root/atrium/data:/app/data nicolaspernoud/atrium:latest"
 #
 # Install And Run Code Server
 #
-  - "export HOME=/root"
-  - "export USER=root"
-  - "mkdir -p  /root/.config/code-server/"
-  - 'sed -i "s/%user_password%/$(scw-userdata user_password)/g" /root/config.yaml'
-  - "mv /root/config.yaml /root/.config/code-server/config.yaml"
-  - "curl -fsSL https://code-server.dev/install.sh | sh"
-  - "sudo systemctl enable --now code-server@$USER"
+  - "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/develop/instance-scripts/config-files/config.yaml -o config.yaml"
 #
 # Run Webtop Container
 #
-  - "docker run -d --name=webtop --security-opt seccomp=unconfined -e PUID=0 -e PGID=0 -e TZ=Europe/Paris -e SUBFOLDER=/ -e KEYBOARD=fr-fr-azerty -e AUTO_LOGIN=false -p 8081:3000 -v /root/webtop:/config -v /var/run/docker.sock:/var/run/docker.sock --shm-size=8gb --cap-add=NET_ADMIN --privileged --restart unless-stopped --sysctl net.ipv6.conf.all.disable_ipv6=0 lscr.io/linuxserver/webtop:ubuntu-xfce"
-  - 'echo "$(scw-userdata user_password)\n$(scw-userdata user_password)" | docker exec -i webtop passwd abc'
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/webtop.sh | sh"
 #
 # Install Repository
 #
diff --git a/instance-scripts/scripts/webtop.sh b/instance-scripts/scripts/webtop.sh
index f6d7123..af8685b 100644
--- a/instance-scripts/scripts/webtop.sh
+++ b/instance-scripts/scripts/webtop.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 #
 # Run Webtop Container
 #
-- 
GitLab