Merge branch 'uranus'

1 files changed, 8 insertions, 20 deletions

diff --git a/guix/uranus.scm b/guix/uranus.scm
index 966280c..2a02fd5 100644
--- a/guix/uranus.scm
+++ b/guix/uranus.scm
@@ -1,4 +1,4 @@
-(define-module (server)
+(define-module (uranus)
   #:use-module (gnu)
   #:use-module (gnu services)
   #:use-module (gnu services web)
@@ -14,8 +14,6 @@
   (timezone "Europe/Athens")
   (keyboard-layout (keyboard-layout "us"))
   (host-name "uranus")
-
-  ;; The list of user accounts ('root' is implicit).
   (users (cons* (user-account
                   (name "thanos")
                   (comment "Thanos Apollo")
@@ -23,19 +21,13 @@
                   (home-directory "/home/thanos")
                   (supplementary-groups '("wheel" "netdev" "audio" "video" "docker")))
                 %base-user-accounts))
-
-  ;; Below is the list of system services.  To search for available
-  ;; services, run 'guix system search KEYWORD' in a terminal.
   (packages
    (append (map specification->package '("docker" "dbus" "docker-cli")) %base-packages))
   (services
    (append (list
-            ;; To configure OpenSSH, pass an 'openssh-configuration'
-            ;; record as a second argument to 'service' below.
             (service openssh-service-type
 		      (openssh-configuration
 		       (permit-root-login 'prohibit-password)))
-
 	    (service nginx-service-type
                      (nginx-configuration
                       (server-blocks
@@ -44,14 +36,19 @@
                               (root "/srv/http/thanosapollo.org")
 			      (listen '("*:8000"))
 			      (ssl-certificate #f)
+			      (ssl-certificate-key #f))
+			     (nginx-server-configuration
+                              (server-name '("bebliotheke.thanosapollo.org"))
+                              (root "/srv/http/bebliotheke")
+			      (listen '("*:8001"))
+			      (ssl-certificate #f)
 			      (ssl-certificate-key #f))))))
-	
 	    (service cgit-service-type
 		     (cgit-configuration
 		      (root-desc "Freely you have received; freely give. | Mathew 10:8")
 		      (project-list '("dotfiles" "gnosis" "yeetube"
 				      "hecate" "pcmpl-emerge" "pcmpl-rc"
-				      "pcmpl-tailscale"))
+				      "pcmpl-tailscale" "greek-polytonic.el"))
 		      (repository-directory "/srv/git")
 		      (root-title "Thanos Apollo | Git server")
 		      ;; (root-readme "/srv/git/README")
@@ -64,21 +61,16 @@
 				     "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDWbBxe1gu9IQEKSIu22Xz7n/w/kCHWl/+7jgDd2YBeqcnIZ3d/s6TGIFDlrZQpSjwkFHke78jk6OW2/LzGn7MH0mYldqdUlbBrAWK1INeQPsdE6bPysKjufLt/E18as1E+gEd1H4lcw63SU2jr+hm/XMU/pK7sCFEbu1n2kAv5qedg6ik0+Ts9y3U9W11DzShATg1TaotgcXvkO+Iaup7wsaPYfUp6MkNBEE9dXg3hrUrtjozlr9bIfcpLwwkG/ZpQJdSPcB/6X9dBg3Crop6iK272vlyvmGohBrvkvuC8EpDVZu+i5xfwr1VAv/kWKdQQyovlJLHC6+S5gGLIE9RC8J5rHSrUkuOcQOhwvEVXThLbtwiXA3ozsyM6Mh/5jVIKc8erqvLrC9+dGh98mAajme4TGFw/agZ5uo/uKehNFGwBEqjXQHFJfjmW0OhjAtNLg2/4E7TuTV+0qtvvxPLEOKiuHDWsVC06OFj5UbLpvMR790j1WhODHVcVlKskop8= thanos@zeus"))
 		      (rc-file (gitolite-rc-file
 				(umask #o0077)))))
-	
 	    (service elogind-service-type
 		     (elogind-configuration
 		      (handle-lid-switch 'ignore)))
-	
             (service dhcp-client-service-type)
             (service ntp-service-type)
             (service cups-service-type)
 
 	    (service containerd-service-type)
 	    (service docker-service-type))
-           ;; This is the default list of services we
-           ;; are appending to.
            %base-services))
-
   (bootloader (bootloader-configuration
                 (bootloader grub-efi-bootloader)
                 (targets (list "/boot/efi"))
@@ -86,10 +78,6 @@
   (swap-devices (list (swap-space
                         (target (uuid
                                  "cc0005c6-0cae-4a38-ae3c-ae32009c7788")))))
-
-  ;; The list of file systems that get "mounted".  The unique
-  ;; file system identifiers there ("UUIDs") can be obtained
-  ;; by running 'blkid' in a terminal.
   (file-systems (cons* (file-system
                          (mount-point "/boot/efi")
                          (device (uuid "54F2-0DFC"