aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2022-12-10 13:37:39 +0100
committerWojtek Kosior <koszko@koszko.org>2022-12-10 13:37:39 +0100
commitb7034c1f9eacfb1294a068e2fbc4a4d406f742bb (patch)
tree67cc249af3d690a7b3e9379d047e17ceaff44e14
parent374ce05bbc6fe20941dd2f6c9ef48e78816eb548 (diff)
downloadkoszko-org-server-b7034c1f9eacfb1294a068e2fbc4a4d406f742bb.tar.gz
koszko-org-server-b7034c1f9eacfb1294a068e2fbc4a4d406f742bb.zip
add sheets.koszko.org and pray.koszko.org virtualhosts
-rw-r--r--.gitmodules3
-rw-r--r--container.scm31
-rw-r--r--hosts-extra6
m---------subrepos/sheets-websites0
4 files changed, 31 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index e343c8e..e8a0521 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
[submodule "hydrilla"]
path = subrepos/hydrilla
url = ../pydrilla
+[submodule "sheets-websites"]
+ path = subrepos/sheets-websites
+ url = ../sheets-websites
diff --git a/container.scm b/container.scm
index df97a46..e6b3278 100644
--- a/container.scm
+++ b/container.scm
@@ -6,6 +6,7 @@
(use-modules (gnu)
(koszko-org-website)
+ (sheets-websites)
(hydrilla-website)
(hydrilla-json-schemas)
(hydrilla)
@@ -101,6 +102,21 @@
(define %koszkonutek-tmp-virtualhost
(koszko-httpd-virtualhost-redirect "koszkonutek-tmp.pl.eu.org" "koszko.org"))
+(define %sheets-virtualhosts
+ (map
+ (lambda (name)
+ (httpd-virtualhost
+ "*:80"
+ `(,@(koszko-httpd-server-meta (string-append name ".koszko.org"))
+ ,(httpd-directive
+ 'DocumentRoot (g-package-file
+ sheets-websites
+ (string-append "/share/" name "-website")))
+
+ ,(koszko-httpd-redirect-if-other-host
+ (string-append name ".koszko.org")))))
+ '("sheets" "pray")))
+
(define %hydrillabugs-virtualhost
(httpd-virtualhost
"*:80"
@@ -253,13 +269,14 @@
(services
(cons* %koszko-httpd-service
(simple-service 'koszko-org-website httpd-service-type
- (list %koszko-org-virtualhost
- %koszkonutek-tmp-virtualhost
- %hydrillabugs-virtualhost
- %hachettebugs-virtualhost
- %haketilo-virtualhost
- %hydrilla-virtualhost
- %hydrillarepos-virtualhost))
+ `(,%koszko-org-virtualhost
+ ,%koszkonutek-tmp-virtualhost
+ ,@%sheets-virtualhosts
+ ,%hydrillabugs-virtualhost
+ ,%hachettebugs-virtualhost
+ ,%haketilo-virtualhost
+ ,%hydrilla-virtualhost
+ ,%hydrillarepos-virtualhost))
(service
(shepherd-service-type
'dummy-network
diff --git a/hosts-extra b/hosts-extra
index f889977..3f8cd63 100644
--- a/hosts-extra
+++ b/hosts-extra
@@ -8,6 +8,10 @@
10.207.87.2 www.koszko.org
10.207.87.2 koszkonutek-tmp.pl.eu.org
10.207.87.2 www.koszkonutek-tmp.pl.eu.org
+10.207.87.2 pray.koszko.org
+10.207.87.2 www.pray.koszko.org
+10.207.87.2 sheets.koszko.org
+10.207.87.2 www.sheets.koszko.org
10.207.87.2 hachettebugs.koszko.org
10.207.87.2 www.hachettebugs.koszko.org
10.207.87.2 hydrillabugs.koszko.org
@@ -16,5 +20,3 @@
10.207.87.2 www.haketilo.koszko.org
10.207.87.2 hydrilla.koszko.org
10.207.87.2 www.hydrilla.koszko.org
-10.207.87.2 hydrillarepos.koszko.org
-10.207.87.2 www.hydrillarepos.koszko.org
diff --git a/subrepos/sheets-websites b/subrepos/sheets-websites
new file mode 160000
+Subproject e4bb845655ccc4c0788336b140845b051bd661a