summaryrefslogtreecommitdiff
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/services/mail.scm35
-rw-r--r--deployment/system.scm2
2 files changed, 35 insertions, 2 deletions
diff --git a/deployment/services/mail.scm b/deployment/services/mail.scm
index 6d15241..a85d4ae 100644
--- a/deployment/services/mail.scm
+++ b/deployment/services/mail.scm
@@ -19,13 +19,46 @@
;;; If not, see <https://www.gnu.org/licenses/>.
(define-module (deployment services mail)
- #:export (smtp-service-aisaka)
+ #:export (dkimproxy-out-service
+ smtp-service-aisaka)
#:use-module (gnu services)
#:use-module (gnu services mail)
#:use-module (guix gexp)
+ #:use-module (sovereign services mail)
#:use-module ((gnu packages mail)
#:prefix gnu:packages:mail:))
+(define dkimproxy-out-signature-configuration-marekpasnikowski.pl-dkim
+ (dkimproxy-out-signature-configuration
+ (algorithm "rsa-sha256")
+ (key "/etc/mail/dkim/marekpasnikowski.pl.key")
+ (method "relaxed")
+ (selector "dkim")
+ (type 'dkim)))
+
+(define dkimproxy-out-signature-configuration-marekpasnikowski.pl-domainkeys
+ (dkimproxy-out-signature-configuration
+ (method "mofws")
+ (type 'domainkeys)))
+
+(define dkimproxy-out-signature-configurations-marekpasnikowski.pl
+ (list dkimproxy-out-signature-configuration-marekpasnikowski.pl-dkim
+ dkimproxy-out-signature-configuration-marekpasnikowski.pl-domainkeys))
+
+(define dkimproxy-out-configuration-sender-map-marekpasnikowski.pl
+ (list "marekpasnikowski.pl"
+ dkimproxy-out-signature-configurations-marekpasnikowski.pl))
+
+(define dkimproxy-out-configuration-marekpasnikowski.pl
+ (dkimproxy-out-configuration
+ (listen "127.0.0.1:10027")
+ (relay "127.0.0.1:10028")
+ (sender-map (list dkimproxy-out-configuration-sender-map-marekpasnikowski.pl))))
+
+(define dkimproxy-out-service
+ (service dkimproxy-out-service-type
+ dkimproxy-out-configuration-marekpasnikowski.pl))
+
(define aliases-file
(mixed-text-file "aliases"
"@ vmail\n"))
diff --git a/deployment/system.scm b/deployment/system.scm
index 6f36be1..16d81aa 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -119,7 +119,7 @@
(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
- users:id1000:dkim-service
+ deployment:services:mail:dkimproxy-out-service
users:id1000:dovecot-service
deployment:system:aisaka:etc
deployment:system:aisaka:fcgiwrap