system.scm: Start clean-up of file and configuration

1 files changed, 31 insertions, 15 deletions

diff --git a/src/guix/system.scm b/src/guix/system.scm
index 3ebfa36..89174d1 100644
--- a/src/guix/system.scm
+++ b/src/guix/system.scm
@@ -2,6 +2,7 @@
   ((ice-9 match) #:prefix m:)
   ((srfi srfi-1) #:prefix s1:)
   ((xyz euandreh heredoc) #:prefix heredoc:)
+  ((org euandre papo) #:prefix papo:)
   ((org euandre packages) #:prefix pkg:)
   ((org euandre queue) #:prefix q:)
   (gnu)
@@ -63,8 +64,9 @@
 
 (define package-records
   (list
-   #;
-   packages:papo.im))  ;; FIXME: move to "website" repository
+   (latest papo:papo.im)
+   (latest papo:status.papo.im)
+   (latest papo:chat.papo.im)))
 
 
 (define binder-service-type
@@ -90,8 +92,12 @@
   (pkg:with-services-from-args
    pkg:untls-service-type
    pkg:<untls-configuration>
-   `(((untls-https) (,@certs "/var/run/untls/https.socket" "/var/run/glaze/glaze.socket"))
-     ((untls-ircs)  (,@certs "/var/run/untls/ircs.socket"  "/var/run/papod/papod.socket")))))
+   `(((untls-https) (,@certs
+                     "/var/run/untls/https.socket"
+                     "/var/run/glaze/glaze.socket"))
+     ((untls-ircs)  (,@certs
+                     "/var/run/untls/ircs.socket"
+                     "/var/run/papod/papod.socket")))))
 
 (use-service-modules web)
 (define simple-postfix-service-type
@@ -122,15 +128,27 @@
       (service ntp-service-type)
       (service dhcp-client-service-type)
       (service fail2ban-service-type)
-      (service binder-service-type    (pkg:binder-configuration (package (latest pkg:binder))))
-      (service glaze-service-type     (pkg:glaze-configuration  (package (latest pkg:glaze))))
-      (service untls-service-type     (pkg:untls-configuration  (package (latest pkg:untls))))
-      (service pkg:wscat-service-type (pkg:wscat-configuration  (package (latest pkg:wscat))))
-      ;; (service pkg:papod-service-type (pkg:papod-configuration  (package (latest pkg:papod))))
-      (service knot-service-type    (q:knot-zones-configuration +tld+ +ipv4+ +ipv6+))
-      (service openssh-service-type (q:openssh-default-configuration (pkg:users->keys +users+)))
-#;
-      (service certbot-service-type (q:tld-certbot-configuration +tld+))
+      (service binder-service-type
+        (pkg:binder-configuration
+          (package (latest pkg:binder))))
+      (service glaze-service-type
+        (pkg:glaze-configuration
+          (package (latest pkg:glaze))))
+      (service untls-service-type
+        (pkg:untls-configuration
+          (package (latest pkg:untls))))
+      (service pkg:wscat-service-type
+        (pkg:wscat-configuration
+          (package (latest pkg:wscat))))
+      #;
+      (service pkg:papod-service-type
+        (pkg:papod-configuration
+          (package (latest pkg:papod))))
+      (service knot-service-type
+        (q:knot-zones-configuration +tld+ +ipv4+ +ipv6+))
+      (service openssh-service-type
+        (q:openssh-default-configuration
+          (pkg:users->keys +users+)))
       (service pkg:syskeep-service-type
         (pkg:syskeep-configuration
           (tld +tld+)))
@@ -142,8 +160,6 @@
       (service q:dkimproxyout-service-type)
       (service q:cyrus-sasl-service-type)
       (service q:dovecot-service-type)
-#;
-      (service q:internet-postfix-service-type)
       (service simple-postfix-service-type)
       (simple-service 'host-specific-etc-file etc-service-type
         `(("id_rsa.pub"      ,(plain-file "id_rsa.pub"      +root-pubkey+))