From 43fc68938d557cb879d7691076d174765364364e Mon Sep 17 00:00:00 2001
From: Nathan Rodet <nrodet@grandlyon.com>
Date: Wed, 21 Dec 2022 15:06:38 +0100
Subject: [PATCH] Changes to cloud-init config
---
terraform/cloud-init.yml | 5 +++--
terraform/main.tf | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/terraform/cloud-init.yml b/terraform/cloud-init.yml
index edc4ce5..a66e41b 100644
--- a/terraform/cloud-init.yml
+++ b/terraform/cloud-init.yml
@@ -17,9 +17,10 @@ runcmd:
- "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
- "source \"$HOME/.cargo/env\""
# Install Docker
- - "curl -fsSL https://get.docker.com -o get-docker.sh | sh"
+ - "curl -fsSL https://get.docker.com -o get-docker.sh"
+ - "sh get-docker.sh"
# Install atrium
- - "git clone https://github.com/nicolaspernoud/atrium.git"
+ - "git clone https://github.com/nicolaspernoud/atrium.git ./root/atrium"
# Run Webtop Container
- "docker stop webtop"
- "docker rm webtop"
diff --git a/terraform/main.tf b/terraform/main.tf
index 30429af..bee8800 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -83,7 +83,7 @@ resource "scaleway_instance_server" "user_instance_server" {
security_group_id = scaleway_instance_security_group.www.id
user_data = {
- USER_PASSWORD = var.USER_PASSWORD
+ user_password = "export USER_PASSWORD=${var.USER_PASSWORD}"
cloud-init = file("cloud-init.yml")
}
--
GitLab