diff options
| -rw-r--r-- | deployment/system.scm | 40 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 44 |
2 files changed, 44 insertions, 40 deletions
diff --git a/deployment/system.scm b/deployment/system.scm index 7c17a83..5a44092 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -19,24 +19,6 @@ ;;; If not, see <https://www.gnu.org/licenses/>. (define-module (deployment system) - #:use-module ((deployment services certbot) - #:prefix deployment:services:certbot:) - #:use-module ((deployment services cgit) - #:prefix deployment:services:cgit:) - #:use-module ((deployment services databases) - #:prefix deployment:services:databases:) - #:use-module ((deployment services dns) - #:prefix deployment:services:dns:) - #:use-module ((deployment services mail) - #:prefix deployment:services:mail:) - #:use-module ((deployment services matrix) - #:prefix deployment:services:matrix:) - #:use-module ((deployment services networking) - #:prefix deployment:services:networking:) - #:use-module ((deployment services vpn) - #:prefix deployment:services:vpn:) - #:use-module ((deployment services web) - #:prefix deployment:services:web:) #:use-module ((deployment system aisaka) #:prefix deployment:system:aisaka:) #:use-module ((deployment system akashi) @@ -119,27 +101,7 @@ (locale-libcs gnu:system:locale:%default-locale-libcs) (name-service-switch gnu:system:nss:%default-nss) (essential-services (gnu:system:operating-system-default-essential-services gnu:system:this-operating-system)) - (services (cons* deployment:services:certbot:aisaka-certbot-service - deployment:services:cgit:aisaka-cgit-service - deployment:services:mail:dkimproxy-out-service - users:id1000:dovecot-service - deployment:services:mail:etc-mailname-aisaka - deployment:services:web:fcgiwrap-service-aisaka - deployment:system:aisaka:gitolite - deployment:system:aisaka:guix-home-service - deployment:system:aisaka:guix-publish-service - deployment:system:aisaka:iproute2-networking - deployment:services:dns:knot-service-aisaka - deployment:services:databases:matrix-postgresql-service - deployment:services:matrix:matrix-service-aisaka - deployment:services:networking:network-online-service-aisaka - deployment:services:web:nginx-service-aisaka - deployment:system:aisaka:offload-rakan - deployment:system:aisaka:radicale - deployment:services:mail:smtp-service-aisaka - deployment:system:aisaka:static-networking - deployment:services:vpn:wireguard-service-aisaka - deployment:system:aisaka:%sovereign-services*)) + (services deployment:system:aisaka:services) (pam-services (gnu:system:pam:base-pam-services)) (privileged-programs gnu:system:%default-privileged-programs) (setuid-programs gnu:system:%setuid-programs) diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 66156a7..16206f2 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -21,12 +21,31 @@ (define-module (deployment system aisaka) #:export (bootloader-aisaka file-systems - host-name-aisaka) + host-name-aisaka + services) #:use-module (guix gexp) #:use-module (sovereign bootloader) #:use-module (sovereign system file-systems) #:use-module ((deployment gexp) #:prefix deployment:gexp:) + #:use-module ((deployment services certbot) + #:prefix deployment:services:certbot:) + #:use-module ((deployment services cgit) + #:prefix deployment:services:cgit:) + #:use-module ((deployment services databases) + #:prefix deployment:services:databases:) + #:use-module ((deployment services dns) + #:prefix deployment:services:dns:) + #:use-module ((deployment services mail) + #:prefix deployment:services:mail:) + #:use-module ((deployment services matrix) + #:prefix deployment:services:matrix:) + #:use-module ((deployment services networking) + #:prefix deployment:services:networking:) + #:use-module ((deployment services vpn) + #:prefix deployment:services:vpn:) + #:use-module ((deployment services web) + #:prefix deployment:services:web:) #:use-module ((gnu bootloader) #:prefix gnu:bootloader:) #:use-module ((gnu bootloader grub) @@ -308,4 +327,27 @@ file-system-boot gnu:system:file-systems:%base-file-systems)) +(define services + (cons* deployment:services:certbot:aisaka-certbot-service + deployment:services:cgit:aisaka-cgit-service + deployment:services:mail:dkimproxy-out-service + users:id1000:dovecot-service + deployment:services:mail:etc-mailname-aisaka + deployment:services:web:fcgiwrap-service-aisaka + gitolite + guix-home-service + guix-publish-service + iproute2-networking + deployment:services:dns:knot-service-aisaka + deployment:services:databases:matrix-postgresql-service + deployment:services:matrix:matrix-service-aisaka + deployment:services:networking:network-online-service-aisaka + deployment:services:web:nginx-service-aisaka + offload-rakan + radicale + deployment:services:mail:smtp-service-aisaka + static-networking + deployment:services:vpn:wireguard-service-aisaka + %sovereign-services*)) + ;;; EOF |