From 0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Wed, 23 Nov 2022 11:21:33 +0100
Subject: add haketilo.koszko.org virtualhost

---
 Makefile | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 79a1133..d40610d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ GUIX_COMMIT := a86979b41a49a8fcdaa887970ba594dbba701226
 
 GUIX_TM = $(GUIX) time-machine --commit=$(GUIX_COMMIT) --
 
-GUIX_LOAD_PATHS = $$(                                \
-	find subrepos/ -mindepth 1 -maxdepth 1       \
-	-exec printf '-L %s/guix-module-dir/' {} ';' \
+GUIX_LOAD_PATHS = $$(                                 \
+	find subrepos/ -mindepth 1 -maxdepth 1        \
+	-exec printf ' -L %s/guix-module-dir/' {} ';' \
 	)
 
 GUIX_SYS_CONTAINER = $(GUIX_TM) system container $(GUIX_LOAD_PATHS)
@@ -24,23 +24,31 @@ GUIX_SHELL = $(GUIX_TM) shell
 
 KOSZKO_ORG_WEBSITE_INFO = \
 	subrepos/koszko-org-website/src/koszko_org_website.egg-info/PKG-INFO
+HYDRILLA_WEBSITE_INFO = \
+	subrepos/hydrilla-website/src/hydrilla_website.egg-info/PKG-INFO
 
 TEST_ROOT_DIR = "/tmp/$$(pwd | sed 's|/|!|g')!!test-root"
 TEST_WWW_DIR=$(TEST_ROOT_DIR)/var/www
 TEST_ALL_LOGS_DIR = $(TEST_ROOT_DIR)/var/log
 TEST_LOG_DIR = $(TEST_ALL_LOGS_DIR)/guix-container
+TEST_ETC_DIR = $(TEST_ROOT_DIR)/etc/guix-container
 
 all: | container-runner.touchfile log
 
 $(KOSZKO_ORG_WEBSITE_INFO):
 	$(MAKE) -C subrepos/koszko-org-website dist
+$(HYDRILLA_WEBSITE_INFO):
+	$(MAKE) -C subrepos/hydrilla-website dist
 
-container-runner: | container.scm $(KOSZKO_ORG_WEBSITE_INFO)
+container-runner: | container.scm          \
+		$(KOSZKO_ORG_WEBSITE_INFO) \
+		$(HYDRILLA_WEBSITE_INFO)
 	$(GUIX_SYS_CONTAINER) container.scm -r container-runner
 	touch container-runner.touchfile
 
-container-runner.touchfile: \
-		container.scm $(KOSZKO_ORG_WEBSITE_INFO)
+container-runner.touchfile: container.scm  \
+		$(KOSZKO_ORG_WEBSITE_INFO) \
+		$(HYDRILLA_WEBSITE_INFO)
 	$(MAKE) clean-runner
 	$(MAKE) container-runner
 
@@ -57,11 +65,17 @@ prepare-test-root:
 	printf ':D\n' > $(TEST_WWW_DIR)/koszko.org/html/index.html
 	@# Prepare replacement `/var/log`
 	mkdir -p $(TEST_ALL_LOGS_DIR)
+	@# Prepare replacement `/etc`
+	mkdir --mode=750 -p $(TEST_ETC_DIR)/hydrilla-website
+	printf 'test non-secret\n' > $(TEST_ETC_DIR)/hydrilla-website/secret.txt
+	chgrp -R 133 $(TEST_ETC_DIR)/hydrilla-website
+	chmod 640 $(TEST_ETC_DIR)/hydrilla-website/secret.txt
 
 GUIX_CONTAINER_FLAGS =                     \
 	-e ./container-runner -p ./pidfile \
 	-l $(TEST_LOG_DIR)                 \
-	-w $(TEST_WWW_DIR)
+	-w $(TEST_WWW_DIR)                 \
+	-t $(TEST_ETC_DIR)
 
 start-container: guix-container.sh container-runner.touchfile \
 		prepare-test-root | log
-- 
cgit v1.2.3

ss='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-07-07 21:14:10 +0200'>2023-07-07</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/image.scm?id=209204e23b39af09e0ea92540b6fa00a60e6a0ae'>image: Prefer gpt partition table for efi images</a></td><td>Sergey Trofimov</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/system/image.scm (efi-disk-image): Use gpt partition-table-type.
(efi32-disk-image): Use gpt partition-table-type.
(qcow2-image-type): Use mbr partition-table-type explicitly.
* gnu/tests/image.scm: Assert partition table type of efi-disk-image.

Signed-off-by: Josselin Poiret &lt;dev@jpoiret.xyz&gt;


</td></tr>
<tr class='logheader'><td><span title='2022-08-30 19:29:58 +0200'>2022-08-30</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/image.scm?id=73fb14c28ae883b6bd22ffdc63d1d59752cb8e0e'>tests: image: New test.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Add a new image test module to validate the image creation itself. The images
structures are validated using guile-parted. Checking the content of those
images is out of scope and should be performed in other modules (installation
for instance).

* gnu/tests/image.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.


</td></tr>