transfer definitions of dkimproxy-out configuration to a more appropriate module

3 files changed, 35 insertions, 36 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
diff --git a/users/id1000.scm b/users/id1000.scm
index ec9445c..529d4a0 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -49,30 +49,9 @@
                  #:prefix sovereign:services:admin:)
   #:use-module ( (sovereign services fontutils)
                  #:prefix sovereign:services:fontutils:)
-  #:use-module ( (sovereign system accounts)
-                 #:prefix sovereign:system:accounts:)
   #:use-module ( (sovereign systems)
                  #:prefix sovereign:systems:))
 
-(define dkimproxy-signature-dkim
-  (dkimproxy-out-signature-configuration
-   (algorithm "rsa-sha256")
-   (key "/etc/mail/dkim/marekpasnikowski.pl.key")
-   (method "relaxed")
-   (selector "dkim")
-   (type 'dkim)))
-
-(define dkimproxy-signature-domainkeys
-  (dkimproxy-out-signature-configuration
-   (method "mofws")
-   (type 'domainkeys)))
-
-;;;;;
-
-(define dkimproxy-signatures-marekpasnikowski
-  (list dkimproxy-signature-dkim
-	dkimproxy-signature-domainkeys))
-
 (define dovecot-imap-login-inet-configuration
   ((@ (gnu services mail) inet-listener-configuration)
    (address "192.168.1.2")
@@ -124,9 +103,6 @@
 
 ;;;
 
-(define dkimproxy-sender-marekpasnikowski
-  `("marekpasnikowski.pl" ,dkimproxy-signatures-marekpasnikowski))
-
 (define dovecot-imap
   ((@ (gnu services mail) protocol-configuration)
    (name "imap")))
@@ -181,12 +157,6 @@
 
 ;;;
 
-(define dkimproxy-out-configuration*
-  (dkimproxy-out-configuration
-   (listen "127.0.0.1:10027")
-   (relay "127.0.0.1:10028")
-   (sender-map `(,dkimproxy-sender-marekpasnikowski))))
-
 (define dovecot-configuration*
   ((@ (gnu services mail) dovecot-configuration)
    (disable-plaintext-auth? #t)
@@ -219,10 +189,6 @@
                                 gnu:home:services:home-environment-variables-service-type
                                 l-variables)))
 
-(define-public dkim-service
-  (gnu:services:service dkimproxy-out-service-type
-	   dkimproxy-out-configuration*))
-
 (define-public dovecot-service
   (gnu:services:service (@ (gnu services mail) dovecot-service-type)
 	   dovecot-configuration*))