seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2026-03-05 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: Migrate for oci-container-service-type deprecation.

Browse Source 
* modules/rosenthal/services/mail.scm (docker-mailserver-service-type)
[extensions]: Use oci-service-type.
* modules/rosenthal/services/web.scm (jellyfin-service-type)
(misskey-service-type, vaultwarden-service-type) [extensions]: Likewise.
This commit is contained in:
Hilton Chain 2025-11-01 08:30:13 +08:00
parent 2e8fd96f92
commit eaa1d09454
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
2 changed files with 104 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/rosenthal/services/mail.scm
View File

@ -3,18 +3,19 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; SPDX-License-Identifier: GPL-3.0-or-later
(define-module (rosenthal services mail) (define-module (rosenthal services mail)
#:use-module (srfi srfi-26) #:use-module (gnu home services shepherd)
#:use-module (gnu home services)
#:use-module (gnu packages mail)
#:use-module (gnu services admin)
#:use-module (gnu services configuration)
#:use-module (gnu services containers)
#:use-module (gnu services docker)
#:use-module (gnu services shepherd)
#:use-module (gnu services)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (rosenthal utils serializers yaml) #:use-module (rosenthal utils serializers yaml)
#:use-module (gnu services) #:use-module (srfi srfi-26)
#:use-module (gnu services admin)
#:use-module (gnu services configuration)
#:use-module (gnu services docker)
#:use-module (gnu services shepherd)
#:use-module (gnu home services)
#:use-module (gnu home services shepherd)
#:use-module (gnu packages mail)
#:export (docker-mailserver-configuration #:export (docker-mailserver-configuration
docker-mailserver-service-type docker-mailserver-service-type
@ -45,32 +46,34 @@
"List of extra Docker arguments.") "List of extra Docker arguments.")
(no-serialization)) (no-serialization))
(define docker-mailserver-oci-containers (define docker-mailserver-oci
(match-record-lambda <docker-mailserver-configuration> (match-record-lambda <docker-mailserver-configuration>
(data-directory log-file shepherd-requirement options extra-arguments) (data-directory log-file shepherd-requirement options extra-arguments)
(let ((docker-mailserver-path (let ((docker-mailserver-path
(cut string-append data-directory <>))) (cut string-append data-directory <>)))
(list (oci-container-configuration (oci-extension
(environment options) (containers
(image "ghcr.io/docker-mailserver/docker-mailserver:latest") (list (oci-container-configuration
(provision "docker-mailserver") (environment options)
(requirement shepherd-requirement) (image "ghcr.io/docker-mailserver/docker-mailserver:latest")
(log-file log-file) (provision "docker-mailserver")
(network "host") (requirement shepherd-requirement)
(volumes (log-file log-file)
`((,(docker-mailserver-path "/data") . "/var/mail") (network "host")
(,(docker-mailserver-path "/state") . "/var/mail-state") (volumes
(,(docker-mailserver-path "/logs") . "/var/log/mail") `((,(docker-mailserver-path "/data") . "/var/mail")
(,(docker-mailserver-path "/config") . "/tmp/docker-mailserver") (,(docker-mailserver-path "/state") . "/var/mail-state")
("/etc/localtime" . "/etc/localtime:ro"))) (,(docker-mailserver-path "/logs") . "/var/log/mail")
(extra-arguments extra-arguments)))))) (,(docker-mailserver-path "/config") . "/tmp/docker-mailserver")
("/etc/localtime" . "/etc/localtime:ro")))
(extra-arguments extra-arguments))))))))
(define docker-mailserver-service-type (define docker-mailserver-service-type
(service-type (service-type
(name 'docker-mailserver) (name 'docker-mailserver)
(extensions (extensions
(list (service-extension oci-container-service-type (list (service-extension oci-service-type
docker-mailserver-oci-containers) docker-mailserver-oci)
(service-extension log-rotation-service-type (service-extension log-rotation-service-type
(compose list docker-mailserver-configuration-log-file)))) (compose list docker-mailserver-configuration-log-file))))
(default-value (docker-mailserver-configuration)) (default-value (docker-mailserver-configuration))

143
modules/rosenthal/services/web.scm
View File

@ -10,6 +10,7 @@
#:use-module (gnu packages web) #:use-module (gnu packages web)
#:use-module (gnu services admin) #:use-module (gnu services admin)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu services containers)
#:use-module (gnu services databases) #:use-module (gnu services databases)
#:use-module (gnu services docker) #:use-module (gnu services docker)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
@ -394,28 +395,30 @@ test its configuration file."))
(chown directory (passwd:uid user) (passwd:gid user)))) (chown directory (passwd:uid user) (passwd:gid user))))
'#$(list cache-directory config-directory))))) '#$(list cache-directory config-directory)))))
(define jellyfin-oci-containers (define jellyfin-oci
(match-record-lambda <jellyfin-configuration> (match-record-lambda <jellyfin-configuration>
(cache-directory config-directory (cache-directory config-directory
proxy-url log-file auto-start? extra-options) proxy-url log-file auto-start? extra-options)
(list (oci-container-configuration (oci-extension
(user "jellyfin") (containers
(group "docker") (list (oci-container-configuration
(environment (user "jellyfin")
(if (maybe-value-set? proxy-url) (group "docker")
`(("http_proxy" . ,proxy-url) (environment
("https_proxy" . ,proxy-url)) (if (maybe-value-set? proxy-url)
'())) `(("http_proxy" . ,proxy-url)
(image "jellyfin/jellyfin:latest") ("https_proxy" . ,proxy-url))
(provision "jellyfin") '()))
(log-file log-file) (image "jellyfin/jellyfin:latest")
(auto-start? auto-start?) (provision "jellyfin")
(respawn? #t) (log-file log-file)
(network "host") (auto-start? auto-start?)
(volumes (respawn? #t)
`((,cache-directory . "/cache") (network "host")
(,config-directory . "/config"))) (volumes
(extra-arguments extra-options))))) `((,cache-directory . "/cache")
(,config-directory . "/config")))
(extra-arguments extra-options)))))))
(define jellyfin-service-type (define jellyfin-service-type
(service-type (service-type
@ -427,8 +430,8 @@ test its configuration file."))
jellyfin-activation) jellyfin-activation)
(service-extension log-rotation-service-type (service-extension log-rotation-service-type
(compose list jellyfin-configuration-log-file)) (compose list jellyfin-configuration-log-file))
(service-extension oci-container-service-type (service-extension oci-service-type
jellyfin-oci-containers))) jellyfin-oci)))
(default-value (jellyfin-configuration)) (default-value (jellyfin-configuration))
(description "Run Jellyfin, a media system."))) (description "Run Jellyfin, a media system.")))
@ -540,7 +543,7 @@ test its configuration file."))
(mkdir-p #$data-directory) (mkdir-p #$data-directory)
(chown #$data-directory (passwd:uid user) (passwd:gid user))))))) (chown #$data-directory (passwd:uid user) (passwd:gid user)))))))
(define misskey-oci-containers (define misskey-oci
(match-record-lambda <misskey-configuration> (match-record-lambda <misskey-configuration>
(image config data-directory log-file ) (image config data-directory log-file )
(let ((config-file (let ((config-file
@ -553,18 +556,20 @@ test its configuration file."))
(let ((emitter (make-yaml-emitter))) (let ((emitter (make-yaml-emitter)))
(yaml-emit! emitter '#$config) (yaml-emit! emitter '#$config)
(display (yaml-emitter-string emitter) port))))))))) (display (yaml-emitter-string emitter) port)))))))))
(list (oci-container-configuration (oci-extension
(user "misskey") (containers
(group "docker") (list (oci-container-configuration
(image image) (user "misskey")
(provision "misskey") (group "docker")
(requirement '(postgresql redis)) (image image)
(log-file log-file) (provision "misskey")
(respawn? #t) (requirement '(postgresql redis))
(network "host") (log-file log-file)
(volumes (respawn? #t)
`((,(string-append data-directory "/files") . "/misskey/files") (network "host")
(,config-file . "/misskey/.config/default.yml")))))))) (volumes
`((,(string-append data-directory "/files") . "/misskey/files")
(,config-file . "/misskey/.config/default.yml"))))))))))
(define misskey-service-type (define misskey-service-type
(service-type (service-type
@ -578,8 +583,8 @@ test its configuration file."))
(compose list misskey-configuration-log-file)) (compose list misskey-configuration-log-file))
(service-extension activation-service-type (service-extension activation-service-type
misskey-activation) misskey-activation)
(service-extension oci-container-service-type (service-extension oci-service-type
misskey-oci-containers))) misskey-oci)))
(description "Run Misskey, an interplanetary microblogging platform."))) (description "Run Misskey, an interplanetary microblogging platform.")))
@ -718,38 +723,40 @@ test its configuration file."))
(write-char #\newline port))) (write-char #\newline port)))
(chown #$log-file (passwd:uid user) (passwd:gid user))))))) (chown #$log-file (passwd:uid user) (passwd:gid user)))))))
(define vaultwarden-oci-containers (define vaultwarden-oci
(match-record-lambda <vaultwarden-configuration> (match-record-lambda <vaultwarden-configuration>
(admin-token database-url port data-directory log-file proxy-url extra-options) (admin-token database-url port data-directory log-file proxy-url extra-options)
(list (oci-container-configuration (oci-extension
(user "vaultwarden") (containers
(group "docker") (list (oci-container-configuration
(host-environment (user "vaultwarden")
`(,@(if (maybe-value-set? admin-token) (group "docker")
`(("ADMIN_TOKEN" . ,admin-token)) (host-environment
'()) `(,@(if (maybe-value-set? admin-token)
("DATABASE_URL" . ,database-url))) `(("ADMIN_TOKEN" . ,admin-token))
(environment '())
`(,@(if (maybe-value-set? proxy-url) ("DATABASE_URL" . ,database-url)))
`(("HTTP_PROXY" . ,proxy-url)) (environment
'()) `(,@(if (maybe-value-set? proxy-url)
("LOG_FILE" . "vaultwarden.log") `(("HTTP_PROXY" . ,proxy-url))
("ROCKET_PORT" . ,(number->string port)) '())
("USE_SYSLOG" . "True") ("LOG_FILE" . "vaultwarden.log")
,@extra-options)) ("ROCKET_PORT" . ,(number->string port))
(image "vaultwarden/server:latest-alpine") ("USE_SYSLOG" . "True")
(provision "vaultwarden") ,@extra-options))
(requirement '(postgresql)) (image "vaultwarden/server:latest-alpine")
(respawn? #t) (provision "vaultwarden")
(network "host") (requirement '(postgresql))
(volumes (respawn? #t)
`((,data-directory . "/data") (network "host")
(,log-file . "/vaultwarden.log"))) (volumes
(extra-arguments `((,data-directory . "/data")
`(,@(if (maybe-value-set? admin-token) (,log-file . "/vaultwarden.log")))
'("--env" "ADMIN_TOKEN") (extra-arguments
'()) `(,@(if (maybe-value-set? admin-token)
"--env" "DATABASE_URL")))))) '("--env" "ADMIN_TOKEN")
'())
"--env" "DATABASE_URL"))))))))
(define vaultwarden-service-type (define vaultwarden-service-type
(service-type (service-type
@ -763,6 +770,6 @@ test its configuration file."))
vaultwarden-activation) vaultwarden-activation)
(service-extension log-rotation-service-type (service-extension log-rotation-service-type
(compose list vaultwarden-configuration-log-file)) (compose list vaultwarden-configuration-log-file))
(service-extension oci-container-service-type (service-extension oci-service-type
vaultwarden-oci-containers))) vaultwarden-oci)))
(description "Run Vaultwarden, a Bitwarden compatible server."))) (description "Run Vaultwarden, a Bitwarden compatible server.")))