From ee8fac8ab8529e2d105c7e55c2c9b28aefd19b46 Mon Sep 17 00:00:00 2001
From: "W. Kosior" <koszko@koszko.org>
Date: Mon, 27 May 2024 12:19:19 +0200
Subject: Update and add remaining files.

---
 vm.scm | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'vm.scm')

diff --git a/vm.scm b/vm.scm
index 2c20f3f..68cff3e 100644
--- a/vm.scm
+++ b/vm.scm
@@ -19,11 +19,12 @@
              ((gnu packages tls) #:select (openssl))
              ((gnu packages web) #:select (httpd))
              ((gnu services) #:select
-              (activation-service-type modify-services service-extension
+              (activation-service-type modify-services service service-extension
                service-type simple-service))
              ((gnu services base) #:select
               (guix-service-type guix-extension %base-services))
-             ((gnu services mcron) #:prefix mc:)
+             ((gnu services desktop) #:select (elogind-service-type))
+             ((gnu services mcron) #:select (cron-daemon-service-type))
              ((gnu services networking) #:select (dhcp-client-service-type))
              ((gnu services shepherd) #:select
               (shepherd-root-service-type shepherd-service))
@@ -130,10 +131,14 @@ Cantius, part of a CTF competition VM.")
                   '(""    "/fullchain.pem" "/privkey.pem")
                   '(#o750 #o640            #o640)))))
 
+(prepend %services
+  (service elogind-service-type))
+
 (prepend %services
   (simple-service 'gemini-main-server-directory activation-service-type
     #~(begin
         (false-if-exception (delete-file "/srv/gemini"))
+        (mkdir-p "/srv")
         (symlink #$(local-file (string-append %here "/gemini")
                                #:recursive? #t)
                  "/srv/gemini"))))
@@ -176,8 +181,7 @@ Cantius, part of a CTF competition VM.")
                             "proxy"
                             "proxy_http"
                             "rewrite"
-                            "ssl"
-                            "userdir"))
+                            "ssl"))
                  web:%default-httpd-modules))
        (extra-config
         (list "\
@@ -197,7 +201,9 @@ Cantius, part of a CTF competition VM.")
               ServerAlias www.ctftilde.koszko.org
               ServerAdmin webmaster@ctftilde.koszko.org
 
-              UserDir /srv/http-users
+              RewriteEngine On
+
+              RewriteRule \"^/~([^/]+)(.*)\" \"/srv/http-users/$1$2\"
 
               ProxyPassMatch ^/(([^~].*)?)$ http://127.0.0.1:8080/$1
               ProxyPassReverse / http://127.0.0.1:8080/
@@ -212,9 +218,7 @@ Cantius, part of a CTF competition VM.")
          '(80 443))))
 
 (prepend %services
-  (service mc:mcron-service-type
-           (mc:mcron-configuration
-            (/var-tabs? #t))))
+  (service cron-daemon-service-type))
 
 (prepend %services
   (service openssh-service-type
-- 
cgit v1.2.3