modules/rosenthal/packages/web.scm

@@ -194,16 +194,16 @@ from serving static websites to running dynamic web applications.")
   (package
     (inherit caddy)
     (name "caddy-dolly")
-    (version "2025.09.20-1")
+    (version "2025.09.06-2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://codeberg.org/hako/caddy.git")
+                    (url "https://git.boiledscript.com/hako/caddy.git")
                     (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3"))))
+                "1ag6wg6limzaijifcijvr60n8bgi77p211sm12pqjr8bslwgx1n7"))))
     (native-inputs
      (modify-inputs (package-native-inputs caddy)
        (replace "vendored-go-dependencies"
@@ -213,7 +213,7 @@ from serving static websites to running dynamic web applications.")
            (file-name "vendored-go-dependencies")
            (sha256
             (base32
-             "1lxbzig37z32nw2njiqy7bild4aw4y32man7490d13gg2s11rbn4"))))))
+             "04f50kbnskx22q8k7mdcnifz3f45jbsl2k9air9y3r49zh48cnin"))))))
     (home-page "https://git.boiledscript.com/hako/caddy")
     (properties '((disable-updater? . #t)))))
 
@@ -302,7 +302,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
 (define-public forgejo
   (package
     (name "forgejo")
-    (version "12.0.3")
+    (version "12.0.0")
     ;; TODO: Address npm dependencies and fetch from git.
     (source (origin
               (method url-fetch)
@@ -311,11 +311,15 @@ pipelines, Hugo renders a complete site in seconds, often less.")
                     version "/forgejo-src-" version ".tar.gz"))
               (sha256
                (base32
-                "0x09nwhps70n8rkvgp7mqzr7cyprdn274q7jhkljxna3r3w8qcb5"))))
+                "0g70rag92pbflsmjnsqdrdvykd9nsz67rxi7scf0lff2mcxqfgfr"))
+              (modules '((guix build utils)))
+              ;; Avoid downloading toolchain.
+              (snippet '(substitute* "go.mod"
+                          (("^toolchain.*") "")))))
     (build-system go-build-system)
     (arguments
      (list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
-           #:go go-1.25
+           #:go go-1.24
            #:install-source? #f
            #:import-path "."
            #:build-flags

modules/rosenthal/services/monitoring.scm

@@ -68,8 +68,7 @@
             (start
              #~(make-forkexec-constructor
                 (list #$(file-append alloy "/bin/alloy") "run" #$config)
-                #:directory "/var/lib/alloy"
-                #:log-file "/var/log/alloy.log"))
+                #:directory "/var/lib/alloy"))
             (stop #~(make-kill-destructor))
             (auto-start? auto-start?)))))
 
@@ -95,6 +94,9 @@
   (config
    ini-config
    "")
+  (database-password-file
+   string
+   "")
   (shepherd-provision
    (list-of-symbols '(grafana))
    "")
@@ -116,10 +118,12 @@
             (home-directory "/var/lib/grafana")))))
 
 (define grafana-postgresql-role
-  (lambda _
+  (match-record-lambda <grafana-configuration>
+      (database-password-file)
     (list (postgresql-role
             (name "grafana")
-            (create-database? #t)))))
+            (create-database? #t)
+            (password-file database-password-file)))))
 
 (define grafana-activation
   (lambda _
@@ -148,8 +152,7 @@
                         "server" "--config" #$config-file)
                   #:user "grafana"
                   #:group "grafana"
-                  #:directory #$(file-append grafana "/share/grafana")
-                  #:log-file "/var/log/grafana.log"))
+                  #:directory #$(file-append grafana "/share/grafana")))
               (stop #~(make-kill-destructor))
               (auto-start? auto-start?))))))
 
@@ -232,8 +235,7 @@
                         (string-append "-config.file=" #$config-file))
                   #:user "loki"
                   #:group "loki"
-                  #:directory "/var/lib/loki"
-                  #:log-file "/var/log/loki.log"))
+                  #:directory "/var/lib/loki"))
               (stop #~(make-kill-destructor))
               (auto-start? auto-start?))))))
 
@@ -314,8 +316,7 @@
                         (string-append "-config.file=" #$config-file))
                   #:user "mimir"
                   #:group "mimir"
-                  #:directory "/var/lib/mimir"
-                  #:log-file "/var/log/mimir.log"))
+                  #:directory "/var/lib/mimir"))
               (stop #~(make-kill-destructor))
               (auto-start? auto-start?))))))
 

modules/rosenthal/services/web.scm

@@ -194,13 +194,11 @@ reload its configuration file."))
 (define forgejo-activation
   #~(begin
       (use-modules (guix build utils))
-      (let ((user (getpwnam "forgejo")))
-        (for-each
-         (lambda (dir)
-           (mkdir-p dir)
-           (chown dir (passwd:uid user) (passwd:gid user))
-           (chmod dir #o750))
-         '("/var/lib/forgejo" "/var/log/forgejo")))))
+      (let ((dir "/var/lib/forgejo")
+            (user (getpwnam "forgejo")))
+        (mkdir-p dir)
+        (chown dir (passwd:uid user) (passwd:gid user))
+        (chmod dir #o750))))
 
 (define forgejo-shepherd-service
   (match-record-lambda <forgejo-configuration>