From f432b7057738cb5123c8e1b506a2a1199e71ee72 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sun, 17 Oct 2021 11:52:47 -0400
Subject: Update cloud services

Rebuilt email server, started wireguard setup.
---
 Biz/Cloud/Web.nix | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'Biz/Cloud/Web.nix')

diff --git a/Biz/Cloud/Web.nix b/Biz/Cloud/Web.nix
index 9899258..68ff19e 100644
--- a/Biz/Cloud/Web.nix
+++ b/Biz/Cloud/Web.nix
@@ -5,6 +5,19 @@ let
   ports = import ./Ports.nix;
 in
 {
+  networking.firewall = {
+    allowedTCPPorts = [
+      ports.ssh
+      ports.git
+      ports.http
+      ports.https
+      ports.sabten
+      ports.gemini
+      ports.radicale
+      ports.znc
+    ];
+  };
+
   services = {
     radicale = {
       enable = true;
@@ -23,10 +36,10 @@ in
         listen = "0.0.0.0:${toString ports.gemini} [::]:${toString ports.gemini}";
         ":tls" = { store = "/var/lib/gmnisrv"; };
         "bsima.me" = {
-          "root" = "/srv/www/ben";
+          "root" = "/var/web/ben";
         };
         "simatime.com" = {
-          "root" = "/srv/www/simatime.com";
+          "root" = "/var/web/simatime.com";
           "cgi" = "on";
         };
       };
@@ -49,14 +62,14 @@ in
           enableACME = true;
           locations = {
             "/" = {
-              root = "/srv/www/simatime.com";
+              root = "/var/web/simatime.com";
               extraConfig = ''
                 autoindex on;
               '';
             };
             # serve /~$USER paths
             "~ ^/~(.+?)(/.*)?$" = {
-              alias = "/srv/www/$1$2";
+              alias = "/var/web/$1$2";
               index = "index.html index.htm";
               extraConfig = ''
                 autoindex on;
@@ -89,7 +102,7 @@ in
 
         "bsima.me" = {
           locations."/" = {
-            root = "/srv/www/ben";
+            root = "/var/web/ben";
             index = "index.html index.htm";
             extraConfig = ''
               autoindex on;
@@ -161,10 +174,6 @@ in
           };
         };
 
-        "grocy.${rootDomain}" = {
-          useACMEHost = rootDomain;
-          forceSSL = true;
-        };
       };
     };
   };
@@ -182,6 +191,5 @@ in
     "sabten"
     "cal"
     "notebook"
-    "grocy"
   ];
 }
-- 
cgit v1.2.3