From 61c1a2da980bdad95ec76c737d657bfbe712103e Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 20 Sep 2023 17:03:29 +0200 Subject: [PATCH] Provide the service source code on the web page Signed-off-by: Denis 'GNUtoo' Carikli --- .gitignore | 2 ++ Makefile.am | 12 +++++++++++- index.html.tmpl | 19 +++++++++++++++---- mumble-vm-system.scm.tmpl | 6 ++++-- 4 files changed, 32 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 778b13f..93b9df5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ install-sh Makefile Makefile.in missing +mumble-vm.tar +mumble-vm.tar.xz mumble-vm-machine.scm mumble-vm-system.scm signing-key.pub diff --git a/Makefile.am b/Makefile.am index a7bcda7..8169984 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,7 +68,7 @@ signing-key.pub: '3A7E1F41E2D5784CFCABB39CB73F99E727D4A5C1ECA79D873587D63D093CC4B5' \ >$@ -IMAGE_SOURCE = \ +TARBALL_SOURCE = \ first-boot.sh \ guix-commit.txt \ index.html \ @@ -79,6 +79,10 @@ IMAGE_SOURCE = \ signing-key.pub \ wireguard-post-up.sh +IMAGE_SOURCE = \ + $(TARBALL_SOURCE) \ + mumble-vm.tar.xz + mumble-vm.img: $(IMAGE_SOURCE) install \ `guix system image \ @@ -86,5 +90,11 @@ mumble-vm.img: $(IMAGE_SOURCE) --image-size=6G mumble-vm-system.scm` \ $@ +mumble-vm.tar: $(TARBALL_SOURCE) + tar --exclude "id_ed25519" -cf $@ $(TARBALL_SOURCE) + +mumble-vm.tar.xz: mumble-vm.tar + xz -f -9e --verbose $< + deploy: $(IMAGE_SOURCE) guix deploy -L . mumble-vm-machine.scm diff --git a/index.html.tmpl b/index.html.tmpl index 1cdf730..1201a43 100644 --- a/index.html.tmpl +++ b/index.html.tmpl @@ -99,9 +99,20 @@ laquelle il tourne, etc.

- +

Code source

+ diff --git a/mumble-vm-system.scm.tmpl b/mumble-vm-system.scm.tmpl index de49297..81b9622 100644 --- a/mumble-vm-system.scm.tmpl +++ b/mumble-vm-system.scm.tmpl @@ -34,12 +34,14 @@ (package (name "website") (version "0.1") - (source (local-file "index.html" )) + ;; TODO: Make that tarball reproducible + (source (local-file "mumble-vm.tar.xz")) (build-system copy-build-system) (arguments (list #:install-plan - #~(list '("index.html" "var/www/DOMAIN/")))) + #~(list '("index.html" "var/www/DOMAIN/") + '(#$source "var/www/DOMAIN/")))) (synopsis "The DOMAIN website.") (description "The website contains how to use the service, and how to