From e12994d96e9ab021074dfcdacd81e9aaa22a3f0a Mon Sep 17 00:00:00 2001
From: Nathan RODET <["nrodet@grandlyon.com"]>
Date: Fri, 27 Jan 2023 09:08:21 +0000
Subject: [PATCH] Update instance-scripts/config-files/config.yaml,
instance-scripts/config-files/atrium.yaml, instance-scripts/scripts/rust.sh,
instance-scripts/cloud-init.yml
---
instance-scripts/cloud-init.yml | 10 +++++-----
instance-scripts/config-files/atrium.yaml | 2 +-
instance-scripts/config-files/config.yaml | 2 +-
instance-scripts/scripts/rust.sh | 3 ++-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml
index c255c0a..401ffe4 100644
--- a/instance-scripts/cloud-init.yml
+++ b/instance-scripts/cloud-init.yml
@@ -17,10 +17,6 @@ runcmd:
- "export HOME=/root"
- "export USER=root"
#
-# Install Rust
-#
- - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/rust.sh | bash"
-#
# Install Docker
#
- "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/docker.sh | bash"
@@ -41,6 +37,10 @@ runcmd:
#
- "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/ttyd.sh | bash"
#
+# Install Rust
+#
+ - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/rust.sh | bash"ssssssssssssssssssssssssssssssssssssssssssssssssssssssss
+#
# Install Repository
#
- - "git clone https://github.com/NathanRodet/rust-axum-demo /root/rust-axum-demo"
\ No newline at end of file
+ - "git clone https://github.com/NathanRodet/rust-axum-demo /root/rust-axum-demo"
diff --git a/instance-scripts/config-files/atrium.yaml b/instance-scripts/config-files/atrium.yaml
index b9f6de3..f24d627 100644
--- a/instance-scripts/config-files/atrium.yaml
+++ b/instance-scripts/config-files/atrium.yaml
@@ -34,4 +34,4 @@ users:
- login: admin
password: %user_password_hash%
roles:
- - ADMINS
\ No newline at end of file
+ - ADMINS
diff --git a/instance-scripts/config-files/config.yaml b/instance-scripts/config-files/config.yaml
index f212ef5..17d78ba 100644
--- a/instance-scripts/config-files/config.yaml
+++ b/instance-scripts/config-files/config.yaml
@@ -2,4 +2,4 @@
bind-addr: 0.0.0.0:8080
auth: password
password: %user_password%
-cert: false
\ No newline at end of file
+cert: false
diff --git a/instance-scripts/scripts/rust.sh b/instance-scripts/scripts/rust.sh
index 21df85f..3989894 100644
--- a/instance-scripts/scripts/rust.sh
+++ b/instance-scripts/scripts/rust.sh
@@ -4,5 +4,6 @@
# Install Rust
#
+export HOME=root
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-source "$HOME/.cargo/env"
\ No newline at end of file
+source "$HOME/.cargo/env"
--
GitLab