From b5be0e66825dfc6826d05ec8f92d4a109ea03d27 Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Thu, 22 Dec 2022 11:18:59 +0100
Subject: [PATCH] Added configuration

---
 instance_scripts/start_webtop.sh | 21 ---------------------
 terraform/cloud-init.yml         |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100755 instance_scripts/start_webtop.sh

diff --git a/instance_scripts/start_webtop.sh b/instance_scripts/start_webtop.sh
deleted file mode 100755
index 9650b16..0000000
--- a/instance_scripts/start_webtop.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-docker stop webtop
-docker rm webtop
-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 80:3000 \
-    -v /root/webtop_data/:/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
diff --git a/terraform/cloud-init.yml b/terraform/cloud-init.yml
index 20807b9..16cb2fe 100644
--- a/terraform/cloud-init.yml
+++ b/terraform/cloud-init.yml
@@ -40,10 +40,10 @@ runcmd:
   - "curl -fsSL https://get.docker.com -o get-docker.sh"
   - "sh get-docker.sh"
 # Setup Atrium
-  - "mkdir -p /root/data/letsencrypt_cache && mkdir /root/app"
-  - "cp -f /root/atrium.yaml /root/data/app/atrium.yaml"
+  - "mkdir -p /root/data/letsencrypt_cache && mkdir -p /root/app/data"
+  - "cp -f -r /root/atrium.yaml /root/app/data/atrium.yaml && rm /root/atrium.yaml"
 # Run Atrium Container
-  - "docker run -d --name atrium --net=host -v /root/atrium.yaml:/app/atrium.yaml -v /root/GeoLite2-City.mmdb:/app/GeoLite2-City.mmdb -v /root/letsencrypt_cache:/app/letsencrypt_cache -v /root/data:/app/data nicolaspernoud/atrium:latest"
+  - "docker run -d --name atrium --net=host -v /root/app/data/atrium.yaml:/app/atrium.yaml -v /root/app/data/GeoLite2-City.mmdb:/app/GeoLite2-City.mmdb -v /root/app/data/letsencrypt_cache:/app/letsencrypt_cache -v /root/data:/app/data nicolaspernoud/atrium:latest"
 # Install Code Server
   - "curl -fsSL https://code-server.dev/install.sh | sh"
   - "mkdir -p  /root/.config/code-server/"
-- 
GitLab