From 864491349b77c2f9f53a4854c524302138867d8c Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Wed, 13 Nov 2024 09:04:02 -0800
Subject: Fix HTTPS redirects outside of LAN

---
 hosts/arrakis/services.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'hosts/arrakis/services.nix')

diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix
index daac1a8..6e7a9fa 100644
--- a/hosts/arrakis/services.nix
+++ b/hosts/arrakis/services.nix
@@ -133,20 +133,6 @@
         	::1 1;
         	192.168.1.0/24 1;
         }
-
-        set $enable_ssl 0;
-
-        if ($geo != 1) {
-        	set $enable_ssl 1
-        }
-
-        if ($scheme != https) {
-        	set $enable_ssl 1
-        }
-
-        if ($enable_ssl) {
-        	return 301 https://$host$request_uri;
-        }
       '';
       enable = true;
 
@@ -165,7 +151,17 @@
           enableACME = true;
 
           extraConfig = ''
-            if ($geo = 0) {
+            set $enable_ssl 0;
+    
+            if ($geo != 1) {
+            	set $enable_ssl 1
+            }
+    
+            if ($scheme != https) {
+            	set $enable_ssl 1
+            }
+    
+            if ($enable_ssl) {
             	return 301 https://$host$request_uri;
             }
           '';
-- 
cgit v1.2.3