mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2025-11-16 17:34:37 +00:00
Compare commits
5 Commits
3daa92a216
...
6d4aff2134
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d4aff2134 | ||
|
|
77a51053c4 | ||
|
|
63f2243f28 | ||
|
|
83943282c9 | ||
|
|
fd288d075b |
@ -194,16 +194,16 @@ from serving static websites to running dynamic web applications.")
|
|||||||
(package
|
(package
|
||||||
(inherit caddy)
|
(inherit caddy)
|
||||||
(name "caddy-dolly")
|
(name "caddy-dolly")
|
||||||
(version "2025.09.06-2")
|
(version "2025.09.20-1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://git.boiledscript.com/hako/caddy.git")
|
(url "https://codeberg.org/hako/caddy.git")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1ag6wg6limzaijifcijvr60n8bgi77p211sm12pqjr8bslwgx1n7"))))
|
"14vpk4939v67jiapl8yn3a2v0sfzblaajlzcqfqii2xcb3a290j3"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(modify-inputs (package-native-inputs caddy)
|
(modify-inputs (package-native-inputs caddy)
|
||||||
(replace "vendored-go-dependencies"
|
(replace "vendored-go-dependencies"
|
||||||
@ -213,7 +213,7 @@ from serving static websites to running dynamic web applications.")
|
|||||||
(file-name "vendored-go-dependencies")
|
(file-name "vendored-go-dependencies")
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"04f50kbnskx22q8k7mdcnifz3f45jbsl2k9air9y3r49zh48cnin"))))))
|
"1lxbzig37z32nw2njiqy7bild4aw4y32man7490d13gg2s11rbn4"))))))
|
||||||
(home-page "https://git.boiledscript.com/hako/caddy")
|
(home-page "https://git.boiledscript.com/hako/caddy")
|
||||||
(properties '((disable-updater? . #t)))))
|
(properties '((disable-updater? . #t)))))
|
||||||
|
|
||||||
@ -302,7 +302,7 @@ pipelines, Hugo renders a complete site in seconds, often less.")
|
|||||||
(define-public forgejo
|
(define-public forgejo
|
||||||
(package
|
(package
|
||||||
(name "forgejo")
|
(name "forgejo")
|
||||||
(version "12.0.0")
|
(version "12.0.3")
|
||||||
;; TODO: Address npm dependencies and fetch from git.
|
;; TODO: Address npm dependencies and fetch from git.
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
@ -311,15 +311,11 @@ pipelines, Hugo renders a complete site in seconds, often less.")
|
|||||||
version "/forgejo-src-" version ".tar.gz"))
|
version "/forgejo-src-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0g70rag92pbflsmjnsqdrdvykd9nsz67rxi7scf0lff2mcxqfgfr"))
|
"0x09nwhps70n8rkvgp7mqzr7cyprdn274q7jhkljxna3r3w8qcb5"))))
|
||||||
(modules '((guix build utils)))
|
|
||||||
;; Avoid downloading toolchain.
|
|
||||||
(snippet '(substitute* "go.mod"
|
|
||||||
(("^toolchain.*") "")))))
|
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
(list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
(list #:tests? (not (%current-target-system)) ;TODO: Run test suite.
|
||||||
#:go go-1.24
|
#:go go-1.25
|
||||||
#:install-source? #f
|
#:install-source? #f
|
||||||
#:import-path "."
|
#:import-path "."
|
||||||
#:build-flags
|
#:build-flags
|
||||||
|
|||||||
@ -68,7 +68,8 @@
|
|||||||
(start
|
(start
|
||||||
#~(make-forkexec-constructor
|
#~(make-forkexec-constructor
|
||||||
(list #$(file-append alloy "/bin/alloy") "run" #$config)
|
(list #$(file-append alloy "/bin/alloy") "run" #$config)
|
||||||
#:directory "/var/lib/alloy"))
|
#:directory "/var/lib/alloy"
|
||||||
|
#:log-file "/var/log/alloy.log"))
|
||||||
(stop #~(make-kill-destructor))
|
(stop #~(make-kill-destructor))
|
||||||
(auto-start? auto-start?)))))
|
(auto-start? auto-start?)))))
|
||||||
|
|
||||||
@ -94,9 +95,6 @@
|
|||||||
(config
|
(config
|
||||||
ini-config
|
ini-config
|
||||||
"")
|
"")
|
||||||
(database-password-file
|
|
||||||
string
|
|
||||||
"")
|
|
||||||
(shepherd-provision
|
(shepherd-provision
|
||||||
(list-of-symbols '(grafana))
|
(list-of-symbols '(grafana))
|
||||||
"")
|
"")
|
||||||
@ -118,12 +116,10 @@
|
|||||||
(home-directory "/var/lib/grafana")))))
|
(home-directory "/var/lib/grafana")))))
|
||||||
|
|
||||||
(define grafana-postgresql-role
|
(define grafana-postgresql-role
|
||||||
(match-record-lambda <grafana-configuration>
|
(lambda _
|
||||||
(database-password-file)
|
|
||||||
(list (postgresql-role
|
(list (postgresql-role
|
||||||
(name "grafana")
|
(name "grafana")
|
||||||
(create-database? #t)
|
(create-database? #t)))))
|
||||||
(password-file database-password-file)))))
|
|
||||||
|
|
||||||
(define grafana-activation
|
(define grafana-activation
|
||||||
(lambda _
|
(lambda _
|
||||||
@ -152,7 +148,8 @@
|
|||||||
"server" "--config" #$config-file)
|
"server" "--config" #$config-file)
|
||||||
#:user "grafana"
|
#:user "grafana"
|
||||||
#:group "grafana"
|
#:group "grafana"
|
||||||
#:directory #$(file-append grafana "/share/grafana")))
|
#:directory #$(file-append grafana "/share/grafana")
|
||||||
|
#:log-file "/var/log/grafana.log"))
|
||||||
(stop #~(make-kill-destructor))
|
(stop #~(make-kill-destructor))
|
||||||
(auto-start? auto-start?))))))
|
(auto-start? auto-start?))))))
|
||||||
|
|
||||||
@ -235,7 +232,8 @@
|
|||||||
(string-append "-config.file=" #$config-file))
|
(string-append "-config.file=" #$config-file))
|
||||||
#:user "loki"
|
#:user "loki"
|
||||||
#:group "loki"
|
#:group "loki"
|
||||||
#:directory "/var/lib/loki"))
|
#:directory "/var/lib/loki"
|
||||||
|
#:log-file "/var/log/loki.log"))
|
||||||
(stop #~(make-kill-destructor))
|
(stop #~(make-kill-destructor))
|
||||||
(auto-start? auto-start?))))))
|
(auto-start? auto-start?))))))
|
||||||
|
|
||||||
@ -316,7 +314,8 @@
|
|||||||
(string-append "-config.file=" #$config-file))
|
(string-append "-config.file=" #$config-file))
|
||||||
#:user "mimir"
|
#:user "mimir"
|
||||||
#:group "mimir"
|
#:group "mimir"
|
||||||
#:directory "/var/lib/mimir"))
|
#:directory "/var/lib/mimir"
|
||||||
|
#:log-file "/var/log/mimir.log"))
|
||||||
(stop #~(make-kill-destructor))
|
(stop #~(make-kill-destructor))
|
||||||
(auto-start? auto-start?))))))
|
(auto-start? auto-start?))))))
|
||||||
|
|
||||||
|
|||||||
@ -194,11 +194,13 @@ reload its configuration file."))
|
|||||||
(define forgejo-activation
|
(define forgejo-activation
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
(let ((dir "/var/lib/forgejo")
|
(let ((user (getpwnam "forgejo")))
|
||||||
(user (getpwnam "forgejo")))
|
(for-each
|
||||||
|
(lambda (dir)
|
||||||
(mkdir-p dir)
|
(mkdir-p dir)
|
||||||
(chown dir (passwd:uid user) (passwd:gid user))
|
(chown dir (passwd:uid user) (passwd:gid user))
|
||||||
(chmod dir #o750))))
|
(chmod dir #o750))
|
||||||
|
'("/var/lib/forgejo" "/var/log/forgejo")))))
|
||||||
|
|
||||||
(define forgejo-shepherd-service
|
(define forgejo-shepherd-service
|
||||||
(match-record-lambda <forgejo-configuration>
|
(match-record-lambda <forgejo-configuration>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user