From 9edde8a74589e8f50bf00044b96d4a7882cf5a63 Mon Sep 17 00:00:00 2001
From: jdlugosz963 <jdlugosz963@gmail.com>
Date: Thu, 20 Jun 2024 05:27:48 +0200
Subject: Add goaccess and radicale service.

---
 hipis.scm | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 11 deletions(-)

(limited to 'hipis.scm')

diff --git a/hipis.scm b/hipis.scm
index e3f4b93..d66bec7 100755
--- a/hipis.scm
+++ b/hipis.scm
@@ -11,9 +11,13 @@
   #:use-module (gnu services version-control)
   #:use-module (gnu services certbot)
   #:use-module (gnu services web)
-  #:use-module (gnu services messaging)
+  #:use-module (gnu services dbus)
+  #:use-module (gnu services desktop)
+  #:use-module (gnu services docker)
 
-  #:use-module (hipis services web))
+  #:use-module (hipis services web)
+  #:use-module (hipis services goaccess)
+  #:use-module (hipis services radicale))
 
 (define jdlugosz-ssh-pub
   (local-file "./jdlugosz.pub"))
@@ -47,19 +51,25 @@
 	    (supplementary-groups '("wheel"  ;; sudo
 				    "netdev" ;; network devices
 				    "tty"
-				    "input")))
+				    "input"
+				    "docker")))
 	   %base-user-accounts))
 
    (packages (append
-	      (specifications->packages '("emacs-no-x-toolkit"
-					  "exfat-utils"
-					  "git"
-					  "nss-certs"
-					  "nmap"
-					  "curl"))
+	      (map car
+		   (specifications->packages '("emacs-no-x-toolkit"
+					       "exfat-utils"
+					       "git"
+					       ;; "nss-certs"
+					       "nmap"
+					       "curl")))
 	      %base-packages))
 
    (services (cons*
+	      (service elogind-service-type)
+	      (service dbus-root-service-type)
+	      (service docker-service-type)
+
 	      (service fail2ban-service-type
 		       (fail2ban-configuration
 			(extra-jails
@@ -73,6 +83,7 @@
 			(permit-root-login 'prohibit-password)
 			(allow-empty-passwords? #f)
 			(password-authentication? #f)
+			(gateway-ports? #t)
 			(authorized-keys
 			 `(("jakub" ,jdlugosz-ssh-pub)))))
 
@@ -116,7 +127,8 @@
 			(certificates
 			 (list
 			  (certificate-configuration
-			   (domains '("jdlugosz.com" "git.jdlugosz.com"))
+			   (domains '("jdlugosz.com" "git.jdlugosz.com"
+				      "caldav.jdlugosz.com" "raport.jdlugosz.com"))
 			   (deploy-hook %nginx-deploy-hook))))))
 
 	      (service cgit-service-type
@@ -146,7 +158,26 @@
 			   (ssl-certificate (letsencrypt-certificate "jdlugosz.com"))
 			   (ssl-certificate-key (letsencrypt-key "jdlugosz.com")))))))
 
-	      (service quassel-service-type)
+	      (service goaccess-service-type
+		       (goaccess-configuration
+			(goaccess-nginx-server-configuration
+			 (nginx-server-configuration
+			  (inherit %goaccess-nginx-server-configuration)
+			  (server-name '("raport.jdlugosz.com"))
+			  (listen '("443 ssl"))
+			  (ssl-certificate (letsencrypt-certificate "jdlugosz.com"))
+			  (ssl-certificate-key (letsencrypt-key "jdlugosz.com"))))))
+
+	      (service radicale-service-type
+		       (radicale-configuration
+			(users `(("admin" . ,(getenv "RADICALE_ADMIN_PASS"))))
+			(radicale-nginx-server-configuration
+			 (nginx-server-configuration
+			  (inherit %radicale-nginx-server-configuration)
+			  (server-name '("caldav.jdlugosz.com"))
+			  (listen '("443 ssl"))
+			  (ssl-certificate (letsencrypt-certificate "jdlugosz.com"))
+			  (ssl-certificate-key (letsencrypt-key "jdlugosz.com"))))))
 
 	      (service hwp-service-type
 		       (hwp-site-configuration
-- 
cgit v1.2.3