From fc0241a87d41a394ef677fc5690fbd77ce46c2a9 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 5 Mar 2022 01:07:04 +0100
Subject: [PATCH] upstream1: move gemini port forwarding to upstream4 proper

---
 config/net/upstream.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/net/upstream.nix b/config/net/upstream.nix
index b053452..35db40d 100644
--- a/config/net/upstream.nix
+++ b/config/net/upstream.nix
@@ -19,12 +19,6 @@ in
           reflect = true;
           sourcePort = 443;
         }
-        { # gemini
-          destination = "${servHosts.c3d2-web}:1965";
-          proto = "tcp";
-          reflect = true;
-          sourcePort = 1965;
-        }
         {
           destination = dn42;
           proto = "udp";
@@ -185,18 +179,24 @@ in
 
     upstream4 = {
       forwardPorts = [
-        {
+        { # http
           destination = "172.20.73.45";
           proto = "tcp";
           reflect = true;
           sourcePort = 80;
         }
-        {
+        { # https
           destination = "172.20.73.45";
           proto = "tcp";
           reflect = true;
           sourcePort = 443;
         }
+        { # gemini
+          destination = "${servHosts.c3d2-web}:1965";
+          proto = "tcp";
+          reflect = true;
+          sourcePort = 1965;
+        }
         {
           destination = "172.20.73.61";
           proto = "tcp";