From 45a414835f6d747cc71e831b5866eacfa0b8113d Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Thu, 22 Dec 2022 14:47:27 +0100
Subject: [PATCH] Added configuration
---
instance_scripts/atrium_scripts/atrium.yaml | 18 ------------------
instance_scripts/atrium_scripts/deploy.sh | 20 --------------------
{terraform => server-scripts}/cloud-init.yml | 5 ++---
terraform/main.tf | 2 +-
4 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 instance_scripts/atrium_scripts/atrium.yaml
delete mode 100644 instance_scripts/atrium_scripts/deploy.sh
rename {terraform => server-scripts}/cloud-init.yml (98%)
diff --git a/instance_scripts/atrium_scripts/atrium.yaml b/instance_scripts/atrium_scripts/atrium.yaml
deleted file mode 100644
index 86aa951..0000000
--- a/instance_scripts/atrium_scripts/atrium.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-hostname: $(scw-userdata atrium_hostname)
-debug_mode: false
-letsencrypt_email: $(scw_userdata atrium_letsencrypt_email)
-apps: # optional : applications served by atrium
- - id: 1
- name: Code
- icon: web_asset
- color: 4292030255
- is_proxy: true
- host: "code-$(scw_userdata atrium_count_index)"
- target: $(scw_userdata atrium_private_ip):8080
- - id: 2
- name: Desktop
- icon: web_asset
- color: 4292030255
- is_proxy: true
- host: "desktop-$(scw_userdata atrium_count_index)"
- target: $(scw_userdata atrium_private_ip):8081
\ No newline at end of file
diff --git a/instance_scripts/atrium_scripts/deploy.sh b/instance_scripts/atrium_scripts/deploy.sh
deleted file mode 100644
index c344485..0000000
--- a/instance_scripts/atrium_scripts/deploy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-cat<<EOF >> ./root/atrium.yaml
-hostname: $(scw-userdata atrium_hostname)
-debug_mode: false
-letsencrypt_email: $(scw_userdata atrium_letsencrypt_email)
-apps: # optional : applications served by atrium
- - id: 1
- name: Code
- icon: web_asset
- color: 4292030255
- is_proxy: true
- host: "code-$(scw_userdata atrium_count_index)"
- target: $(scw_userdata atrium_private_ip):8080
- - id: 2
- name: Desktop
- icon: web_asset
- color: 4292030255
- is_proxy: true
- host: "desktop-$(scw_userdata atrium_count_index)"
- target: $(scw_userdata atrium_private_ip):8081
-EOF
diff --git a/terraform/cloud-init.yml b/server-scripts/cloud-init.yml
similarity index 98%
rename from terraform/cloud-init.yml
rename to server-scripts/cloud-init.yml
index 2eca3a5..37a5dc2 100644
--- a/terraform/cloud-init.yml
+++ b/server-scripts/cloud-init.yml
@@ -23,7 +23,6 @@ write_files:
is_proxy: true
host: "code-%atrium_count_index%"
target: %atrium_private_ip%:8080
- apps: # optional : applications served by atrium
- id: 2
name: Desktop
icon: web_asset
@@ -54,13 +53,13 @@ runcmd:
- 'sed -i "s/%atrium_count_index%/$(scw-userdata atrium_count_index)/g" /root/atrium.yaml'
- 'sed -i "s/%atrium_private_ip%/$(scw-userdata atrium_private_ip)/g" /root/atrium.yaml'
- "cp -f /root/atrium.yaml /root/app/atrium.yaml"
+# Run Atrium Container
+ - "docker run -d --name atrium --net=host -v /root/app/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/app/data:/app/data nicolaspernoud/atrium:latest"
# Install Code Server
- "curl -fsSL https://code-server.dev/install.sh | sh"
- "mkdir -p /root/.config/code-server/"
- 'sed -i "s/%user_password%/$(scw-userdata user_password)/g" /root/config.yaml'
- "cp -f /root/config.yaml /root/.config/code-server/config.yaml"
-# Run Atrium Container
- - "docker run -d --name atrium --net=host -v /root/app/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/app/data:/app/data nicolaspernoud/atrium:latest"
# Run Code Server
- "systemctl enable --now code-server@$USER"
# Run Webtop Container
diff --git a/terraform/main.tf b/terraform/main.tf
index e1b7aac..d8e8229 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -88,7 +88,7 @@ resource "scaleway_instance_server" "user_instance_server" {
atrium_hostname = scaleway_domain_record.host_subdomain_record[count.index].name
atrium_letsencrypt_email = var.LETSENCRYPT_EMAIL
user_password = var.USER_PASSWORD
- cloud-init = file("cloud-init.yml")
+ cloud-init = file("../server-scripts/cloud-init.yml")
}
depends_on = [
--
GitLab