diff options
| -rw-r--r-- | deployment/services/mail.scm | 12 | ||||
| -rw-r--r-- | deployment/services/web.scm | 17 | ||||
| -rw-r--r-- | deployment/system.scm | 4 | ||||
| -rw-r--r-- | deployment/system/aisaka.scm | 23 |
4 files changed, 30 insertions, 26 deletions
diff --git a/deployment/services/mail.scm b/deployment/services/mail.scm index 99960fb..0101de9 100644 --- a/deployment/services/mail.scm +++ b/deployment/services/mail.scm @@ -22,6 +22,7 @@ (define-module (deployment services mail) #:export (dkimproxy-out-service + etc-mailname-aisaka smtp-service-aisaka) #:use-module (gnu services) #:use-module (gnu services mail) @@ -158,6 +159,17 @@ (log-file "/val/log/mail.log") (setgid-commands? #t))) +(define etc-mailname-aisaka + (let* + ((file (plain-file "mailname-aisaka" + "marekpasnikowski.pl\n")) + (mailname (list "mailname" + file)) + (links (list mailname))) + (simple-service 'etc-mailname + etc-service-type + links))) + (define smtp-service-aisaka (service opensmtpd-service-type opensmtpd-configuration-aisaka)) diff --git a/deployment/services/web.scm b/deployment/services/web.scm index ef59751..fdbf007 100644 --- a/deployment/services/web.scm +++ b/deployment/services/web.scm @@ -19,7 +19,8 @@ ;;; If not, see <https://www.gnu.org/licenses/>. (define-module (deployment services web) - #:export (nginx-service-aisaka + #:export (fcgiwrap-service-aisaka + nginx-service-aisaka nginx-location-well-known nginx-service-type*) #:use-module (gnu services) @@ -27,11 +28,25 @@ #:use-module (guix gexp) #:use-module ((gnu packages matrix) #:prefix gnu:packages:matrix:) + #:use-module ((gnu packages web) + #:prefix gnu:packages:web:) #:use-module ((gnu system shadow) #:prefix gnu:system:shadow:) #:use-module ((sovereign system accounts) #:prefix sovereign:system:accounts:)) +(define fcgiwrap-configuration-aisaka + (fcgiwrap-configuration + (package gnu:packages:web:fcgiwrap) + (socket "tcp:127.0.0.1:9000") + (user "git") + (group "git"))) + +(define fcgiwrap-service-aisaka + (service + fcgiwrap-service-type + fcgiwrap-configuration-aisaka)) + (define nginx-accounts (let ((accounts- (list sovereign:system:accounts:nginx-group diff --git a/deployment/system.scm b/deployment/system.scm index 766d4d0..4227253 100644 --- a/deployment/system.scm +++ b/deployment/system.scm @@ -125,8 +125,8 @@ deployment:services:cgit:aisaka-cgit-service deployment:services:mail:dkimproxy-out-service users:id1000:dovecot-service - deployment:system:aisaka:etc - deployment:system:aisaka:fcgiwrap + 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 diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index 6436f46..4ecd374 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -45,8 +45,6 @@ #:prefix gnu:services:shepherd:) #:use-module ((gnu services version-control) #:prefix gnu:services:version-control:) - #:use-module ((gnu services web) - #:prefix gnu:services:web:) #:use-module ((gnu system) #:prefix gnu:system:) #:use-module ((gnu system accounts) @@ -84,27 +82,6 @@ #:use-module ((users vmail) #:prefix users:vmail:)) -(define-public etc - (let* - ((mailname-file- (plain-file "mailname" - "marekpasnikowski.pl\n")) - (mailname-link- (list "mailname" - mailname-file-)) - (etc-links- (list mailname-link-))) - (gnu:services:simple-service 'etc-files - gnu:services:etc-service-type - etc-links-))) - -(define fcgiwrap-configuration - (gnu:services:web:fcgiwrap-configuration - (user "git") - (group "git"))) - -(define-public fcgiwrap - (gnu:services:service - gnu:services:web:fcgiwrap-service-type - fcgiwrap-configuration)) - (define-public file-system-efi (gnu:system:file-systems:file-system (device (gnu:system:file-systems:file-system-label "BOOT")) |