From 362b227202dff0adf43242fb3bde0f582c429ec0 Mon Sep 17 00:00:00 2001
From: geemili <opensource@geemili.xyz>
Date: Tue, 9 Jan 2024 16:40:25 -0700
Subject: [PATCH] fix: put connect_via_tailscale matcher inside block

---
 configuration.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index f25ed1e..78bc40e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -398,14 +398,10 @@
     enable = true;
     globalConfig = ''
       email "fresh.car0178@geemili.xyz"
-
-      @connected_via_tailscale {
-        remote_ip 100.64.0.0/10
-        remote_ip fd7a:115c:a1e0::/48
-      }
     '';
 
     virtualHosts."lldap.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:17170
       }
@@ -417,6 +413,7 @@
     '';
 
     virtualHosts."cockpit.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:9090
       }
@@ -432,6 +429,7 @@
     '';
 
     virtualHosts."nextcloud.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         # https://docs.nextcloud.com/server/27/admin_manual/issues/general_troubleshooting.html#service-discovery
         redir /.well-known/carddav /remote.php/dav 301
@@ -448,6 +446,7 @@
     '';
 
     virtualHosts."glauth.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:5555
       }
@@ -455,6 +454,7 @@
     '';
 
     virtualHosts."dex.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:5556
       }
@@ -462,6 +462,7 @@
     '';
 
     virtualHosts."kavita.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:5000
       }
@@ -469,6 +470,7 @@
     '';
  
     virtualHosts."aria.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         handle /jsonrpc {
           reverse_proxy localhost:6800
@@ -483,24 +485,28 @@
     '';
 
     virtualHosts."lid.arr.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:8686
       }
       respond 403
     '';
     virtualHosts."rad.arr.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:7878
       }
       respond 403
     '';
     virtualHosts."read.arr.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:8787
       }
       respond 403
     '';
     virtualHosts."son.arr.samsehu.perli.casa".extraConfig = ''
+      @connected_via_tailscale remote_ip 100.64.0.0/10 fd7a:115c:a1e0::/48
       handle @connected_via_tailscale {
         reverse_proxy localhost:8989
       }