summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2026-05-24 15:06:05 +0200
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2026-05-24 15:14:09 +0200
commite041edca4cd89e091d28751f87a380c6f86250f0 (patch)
tree079d0ad1914f08139d645938e0a5fbbdbed8f1f0
parentafd703756c74d36d720080dce22f994418c5ff03 (diff)
(services mail): transfer definition of the mailname file in /etcHEADtestmaster
-rw-r--r--deployment/services/mail.scm12
-rw-r--r--deployment/system.scm2
-rw-r--r--deployment/system/aisaka.scm11
3 files changed, 13 insertions, 12 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/system.scm b/deployment/system.scm
index 766d4d0..62783da 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -125,7 +125,7 @@
deployment:services:cgit:aisaka-cgit-service
deployment:services:mail:dkimproxy-out-service
users:id1000:dovecot-service
- deployment:system:aisaka:etc
+ deployment:services:mail:etc-mailname-aisaka
deployment:system:aisaka:fcgiwrap
deployment:system:aisaka:gitolite
deployment:system:aisaka:guix-home-service
diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm
index 6436f46..ac4eda5 100644
--- a/deployment/system/aisaka.scm
+++ b/deployment/system/aisaka.scm
@@ -84,17 +84,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")