From 17ea3e907cacb77282d31d9ab3c5db97ef06573b Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Thu, 22 Dec 2022 14:19:47 +0100
Subject: [PATCH] Added configuration
---
.gitlab-ci.yml | 2 +-
terraform/cloud-init.yml | 25 +++++++++++++++++--------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2372602..fd5be16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ before_script:
- export TF_VAR_SCW_PROJECT_ID=${TF_VAR_SCW_PROJECT_ID}
- export TF_VAR_INSTANCES_COUNT=${TF_VAR_INSTANCES_COUNT}
- export TF_VAR_USER_PASSWORD=${TF_VAR_USER_PASSWORD}
- - export TF_VAR_LETSENCRYPT_EMAIL={TF_VAR_LETSENCRYPT_EMAIL}
+ - export TF_VAR_LETSENCRYPT_EMAIL=${TF_VAR_LETSENCRYPT_EMAIL}
- export TF_VAR_ENVIRONMENT=${ENVIRONMENT}
stages:
diff --git a/terraform/cloud-init.yml b/terraform/cloud-init.yml
index 27c6c93..2eca3a5 100644
--- a/terraform/cloud-init.yml
+++ b/terraform/cloud-init.yml
@@ -10,6 +10,7 @@ packages:
- git
write_files:
+# Atrium config file
- content: |
hostname: %atrium_hostname%
debug_mode: false
@@ -31,6 +32,13 @@ write_files:
host: "desktop-%atrium_count_index%"
target: %atrium_private_ip%: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
@@ -39,19 +47,20 @@ runcmd:
# Install Docker
- "curl -fsSL https://get.docker.com -o get-docker.sh"
- "sh get-docker.sh"
-# Setup Atrium
+# Install Atrium
- "mkdir -p /root/app/data/letsencrypt_cache"
- - 'sed -i "s/%atrium_hostname%/$(scw-userdata atrium_hostname)/g" atrium.yaml'
- - 'sed -i "s/%atrium_letsencrypt_email%/$(scw-userdata atrium_letsencrypt_email)/g" atrium.yaml'
- - 'sed -i "s/%atrium_count_index%/$(scw-userdata atrium_count_index)/g" atrium.yaml'
- - 'sed -i "s/%atrium_private_ip%/$(scw-userdata atrium_private_ip)/g" atrium.yaml'
+ - 'sed -i "s/%atrium_hostname%/$(scw-userdata atrium_hostname)/g" /root/atrium.yaml'
+ - 'sed -i "s/%atrium_letsencrypt_email%/$(scw-userdata atrium_letsencrypt_email)/g" /root/atrium.yaml'
+ - '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/"
- - 'echo "bind-addr: 0.0.0.0:8080\nauth: password\npassword: $(scw-userdata user_password)\ncert: false\n" > /root/.config/code-server/config.yaml'
+ - '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
--
GitLab