diff options
| -rw-r--r-- | deployment/services/web.scm | 10 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 16 |
2 files changed, 5 insertions, 21 deletions
diff --git a/deployment/services/web.scm b/deployment/services/web.scm index a70dd44..52d8385 100644 --- a/deployment/services/web.scm +++ b/deployment/services/web.scm @@ -8,8 +8,6 @@ #:use-module (gnu services) #:use-module (gnu services web) #:use-module (guix gexp) - #:use-module ((deployment system aisaka) - #:prefix deployment:system:aisaka:) #:use-module ((gnu packages matrix) #:prefix gnu:packages:matrix:) #:use-module ((gnu packages version-control) @@ -21,7 +19,9 @@ #:use-module ((gnu services version-control) #:prefix gnu:services:version-control:) #:use-module ((gnu system shadow) - #:prefix gnu:system:shadow:)) + #:prefix gnu:system:shadow:) + #:use-module ((sovereign system accounts) + #:prefix sovereign:system:accounts:)) (define cgit-repository-configuration (gnu:services:cgit:repository-cgit-configuration @@ -35,8 +35,8 @@ (define nginx-accounts (let - ((accounts- (list deployment:system:aisaka:nginx-group - deployment:system:aisaka:nginx-account))) + ((accounts- (list sovereign:system:accounts:nginx-group + sovereign:system:accounts:nginx-account))) (const accounts-))) (define nginx-extension-of-account diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 8035789..cd32e05 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -74,22 +74,6 @@ (define dovecot-keys "/secrets/dovecot") -(define-public nginx-account - (gnu:system:accounts:user-account - (name "nginx") - (group "nginx") - (supplementary-groups '("git")) - (system? #t) - (comment "nginx server user") - (home-directory "/var/empty") - (shell (file-append (gnu:packages:specification->package "shadow") - "/sbin/nologin")))) - -(define-public nginx-group - (gnu:system:accounts:user-group - (name "nginx") - (system? #t))) - (define-public etc (let* ((mailname-file- (plain-file "mailname" |