From 5a4f5f9cda5bebf31f507198d96285e3c1502006 Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas.karolak@ubicast.eu>
Date: Fri, 3 Apr 2020 11:54:19 +0200
Subject: [PATCH] use repo instead of nextcloud url for static files
---
.gitignore | 2 +-
packer/example.json | 4 ++--
packer/files/support.pub | 1 +
packer/scripts/root.sh | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
create mode 100644 packer/files/support.pub
diff --git a/.gitignore b/.gitignore
index b3267192..94b749e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,7 @@ log/
# packer
packer_cache/
output/
-packer/*
+packer/*.json
!packer/example.json
# ide
diff --git a/packer/example.json b/packer/example.json
index d4ea114a..ed316d9d 100644
--- a/packer/example.json
+++ b/packer/example.json
@@ -18,7 +18,7 @@
"vm_name": "ubicast-{{ user `name` }}",
"display_name": "ubicast-{{ user `name` }}",
"output_directory": "output",
- "guest_os_type": "debian10-64",
+ "guest_os_type": "debian-64",
"iso_urls": [
"http://debian.univ-lorraine.fr/debian-cd/current/amd64/iso-cd/debian-10.3.0-amd64-netinst.iso",
"https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-10.3.0-amd64-netinst.iso"
@@ -47,7 +47,7 @@
"hostname={{ .Name }} ",
"domain= ",
"auto=true ",
- "url=https://nextcloud.ubicast.net/s/LEcyMWG9BnKsrHX/download?path=%2F&files=preseed.cfg ",
+ "url=https://git.ubicast.net/mediaserver/envsetup/-/raw/master/packer/files/preseed.cfg ",
"vga=788 noprompt quiet --<enter>"
],
"ssh_username": "root",
diff --git a/packer/files/support.pub b/packer/files/support.pub
new file mode 100644
index 00000000..523cb036
--- /dev/null
+++ b/packer/files/support.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr2IJlzvLlLxa2PyGhydAlz/PAOj240g8anQmY58X+llirLHIOlkdJXBqf94jAeZkweWpoE41RdmKPUQEz4pCO09dGJaZD4lv1NtDhrhNwTmoOnyFckoPimR6DX6+UMM9wUmfti/ytljbVEVVo/pRacXmczeumDaci3uYTURyliuAR9h3zbIMQ6D2COESXjptWmEwawE9grsTfJi84Q+XIBPvXRHjjceB5hejUMWuf7xc6GH9WIo5REh3qTUvgtxHtIGLQ3ImOzrbCsEhENrBWds0qH0pIuH0lykWGR6pumpPxLzXcVho+e/UJgUrEg5u6/58aizqJTkxFJMa8ciYz support@ubicast
diff --git a/packer/scripts/root.sh b/packer/scripts/root.sh
index 7e37a363..10a86199 100644
--- a/packer/scripts/root.sh
+++ b/packer/scripts/root.sh
@@ -2,6 +2,6 @@
sudo mkdir -p /root/.ssh
sudo chmod 700 /root/.ssh
-curl -fLSs 'https://nextcloud.ubicast.net/s/LEcyMWG9BnKsrHX/download?path=%2F&files=support.pub' -o /root/.ssh/authorized_keys
+curl -fLSs 'https://git.ubicast.net/mediaserver/envsetup/-/raw/master/packer/files/support.pub' -o /root/.ssh/authorized_keys
exit 0
--
GitLab