servers/vps/machines.scm: Cleanup email configuration for now

1 files changed, 4 insertions, 39 deletions

diff --git a/servers/vps/machines.scm b/servers/vps/machines.scm
index d20e4ac..8933709 100644
--- a/servers/vps/machines.scm
+++ b/servers/vps/machines.scm
@@ -25,8 +25,6 @@
 
 (define user "andreh")
 (define tld (slurp "servers/vps/tld.txt"))
-(define mail-domain (string-append mail-domain-prefix "." tld))
-(define matrix-domain (string-append matrix-domain-prefix "." tld))
 
 ;; permit nopass :wheel
 (define sudoers "\
@@ -42,26 +40,11 @@ root ALL=(ALL) ALL
 (define (tls-priv-for domain)
   (string-append letsencrypt-prefix domain "/privkey.pem"))
 
-(define opensmtpd-config
-  (string-append "
-listen on eth0
-# File comes from mail-aliases-service-type
-table aliases file:/etc/aliases
-accept from any domain " mail-domain " alias <aliases> deliver to maildir
-accept for local alias <aliases> deliver to maildir
-accept for any relay
-
-pki " mail-domain " cert \"" (tls-pub-for  mail-domain) "\"
-pki " mail-domain " key  \"" (tls-priv-for mail-domain) "\""))
-
 (define tls-domains
-  (list tld
-				mail-domain
-				matrix-domain))
+  (list tld))
 
 (define my-system
   (operating-system
-    (timezone "America/Sao_Paulo")
     (host-name (slurp "servers/vps/hostname.txt"))
     (users (cons* (user-account
                    (name user)
@@ -88,30 +71,19 @@ pki " mail-domain " key  \"" (tls-priv-for mail-domain) "\""))
             (service git-daemon-service
 										 (git-daemon-configuration
 											(export-all? #t)))
-            (simple-service 'automatic-services-restart
-                            activation-service-type
-                            (with-imported-modules '((gnu services herd))
-                              #~(begin
-                                  (use-modules (gnu services herd))
-                                  (for-each restart-service
-                                            '(mcron
-                                              nginx)))))
             (service unattended-upgrade-service-type
                      (unattended-upgrade-configuration
-                      (schedule "30 1 * * 0")))
+                      (schedule "30 3 * * *")))
             (service mcron-service-type
                      (mcron-configuration
                       (jobs
                        (list #~(job "30 1 * * 1" "/opt/bin/gc.sh")
                              #~(job "30 0 * * *" "/opt/bin/backup.sh")))))
-            #;
-            (service opensmtpd-service-type
-                     (opensmtpd-configuration
-                      (config-file (plain-file "euandreh-smtpd.conf" opensmtpd-config))))
             (service nginx-service-type
 										 (nginx-configuration
 											(server-blocks
 											 (list (nginx-server-configuration
+															(server-name tls-domains))
 															(ssl-certificate     (tls-pub-for  tld))
 															(ssl-certificate-key (tls-priv-for tld)))))))
             (service certbot-service-type
@@ -120,14 +92,7 @@ pki " mail-domain " key  \"" (tls-priv-for mail-domain) "\""))
                       (certificates
                        (list
                         (certificate-configuration
-                         (domains tls-domains))))))
-            (simple-service 'automatic-certbot-renewal
-                            activation-service-type
-                            (with-imported-modules '((gnu services herd))
-                              #~(begin
-                                  (use-modules (gnu services herd))
-                                  (execl "/var/lib/certbot/renew-certificates")
-                                  (restart-service 'nginx)))))
+                         (domains tls-domains)))))))
       (modify-services
        %base-services
        (guix-service-type