diff options
| author | Wojtek Kosior <koszko@koszko.org> | 2022-11-23 11:21:33 +0100 |
|---|---|---|
| committer | Wojtek Kosior <koszko@koszko.org> | 2022-11-23 11:21:33 +0100 |
| commit | 0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5 (patch) | |
| tree | 6967ec83989e35c075dd9bbbc4fe088f317a2da4 /Makefile | |
| parent | b3e66d97993318e91c0ff634fec62978f6530785 (diff) | |
| download | koszko-org-server-0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5.tar.gz koszko-org-server-0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5.zip | |
add haketilo.koszko.org virtualhost
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 21 insertions, 7 deletions
@@ -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 |