From 8e5f6991f93daa1fee182283ecf4aff279e9e373 Mon Sep 17 00:00:00 2001
From: Administrator <root@distrust.network>
Date: Tue, 4 Nov 2025 19:28:28 +0000
Subject: [PATCH] site and .onion tweaks

---
 services/akkoma.nix      | 1 +
 services/forgejo.nix     | 1 +
 services/nextcloud.nix   | 6 ++++--
 services/site.nix        | 3 ++-
 services/vaultwarden.nix | 1 +
 site/index.html          | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/services/akkoma.nix b/services/akkoma.nix
index 2f71f2c..7531f60 100644
--- a/services/akkoma.nix
+++ b/services/akkoma.nix
@@ -43,6 +43,7 @@ in {
 
     caddy.virtualHosts."https://social.distrust.network ${onionUrl}".extraConfig = ''
       reverse_proxy localhost:${toString fediPort}
+      header Onion-Loction ${onionUrl}
     '';
 
     tor.relay.onionServices."akkoma".map = [
diff --git a/services/forgejo.nix b/services/forgejo.nix
index 025b38f..81480cc 100644
--- a/services/forgejo.nix
+++ b/services/forgejo.nix
@@ -16,6 +16,7 @@ in {
 
     caddy.virtualHosts."https://git.distrust.network ${onionUrl}".extraConfig = ''
       reverse_proxy localhost:${toString forgejoPort}
+      header Onion-Location ${onionUrl}
     '';
 
     tor.relay.onionServices."forgejo".map = [
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index beb3ada..9930b22 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -4,7 +4,8 @@
   lib,
   ...
 }: let
-  onionUrl = "http://znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion";
+  onionDomain = "znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion";
+  onionUrl = "http://${onionDomain}";
 in {
   age.secrets."nextcloud-admin-pass".file = ../secrets/nextcloud-admin-pass;
 
@@ -14,7 +15,7 @@ in {
       enable = true;
       hostName = "cloud.distrust.network";
       settings = {
-        trusted_domains = ["znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion"];
+        trusted_domains = [onionDomain];
         trusted_proxies = ["127.0.0.1"];
         maintenance_window_start = 1;
       };
@@ -63,6 +64,7 @@ in {
         X-Forwarded-For {remote_host}
         X-Forwarded-Proto {scheme}
         X-Forwarded-Host {host}
+        Onion-Loation ${onionUrl}
       }
 
 
diff --git a/services/site.nix b/services/site.nix
index 54bc239..3459106 100644
--- a/services/site.nix
+++ b/services/site.nix
@@ -1,10 +1,11 @@
 let
-  onionUrl = "http://nzmkihvxjazbb3fgu7drbklpt6ibg4suff4glxpadhrd4pf5wd2od5yd.onion";
+  onionUrl = "http://distrustdtp5qgbk2firlzfkkmu5p6v6acuh2ox454zd2i3ujdqad5yd.onion";
 in {
   services.caddy.virtualHosts = {
     "https://distrust.network ${onionUrl}".extraConfig = ''
       root * /etc/nixos/site
       file_server
+      header Onion-Location ${onionUrl}
     '';
   };
 
diff --git a/services/vaultwarden.nix b/services/vaultwarden.nix
index b386a8c..07d647b 100644
--- a/services/vaultwarden.nix
+++ b/services/vaultwarden.nix
@@ -16,6 +16,7 @@ in {
 
     caddy.virtualHosts."https://vault.distrust.network ${onionUrl}".extraConfig = ''
       reverse_proxy localhost:${toString vaultPort}
+      header Onion-Location ${onionUrl}
     '';
 
     tor.relay.onionServices."vaultwarden".map = [
diff --git a/site/index.html b/site/index.html
index e107a65..b91264f 100755
--- a/site/index.html
+++ b/site/index.html
@@ -44,7 +44,7 @@
         <p><code>distrust.network</code> works off one simple principle:</p>
 	<i>> I don't know you, and I don't want to.</i>
 	<p>Pricing starts at $1 per month (or however you'd like to pay, any extra being a tip), and upgrades to lifetime access as soon as you have paid $100 total. Payment is in <a title="I will reply with an address to send the money to once you request an account.">BTC only</a>.</p>
-	<p>We provide a plethora of services, available through either <a href="http://nzmkihvxjazbb3fgu7drbklpt6ibg4suff4glxpadhrd4pf5wd2od5yd.onion/">TOR</a> or the <a href="https://distrust.network/">clearnet</a>. These include (and <i>are</i> limited to):</p>
+	<p>We provide a plethora of services, available through either <a href="http://distrustdtp5qgbk2firlzfkkmu5p6v6acuh2ox454zd2i3ujdqad5yd.onion/">TOR</a> or the <a href="https://distrust.network/">clearnet</a>. These include (and <i>are</i> limited to):</p>
         <ul>
 	    <li>E-Mail <a title="An E-Mail client is included as a Nextcloud App. Alternatively, bring your own."><small>[hover]</small></a></li>
 	    <li>Nextcloud (10GB) <small><a href="http://znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion/login">[tor]</a> <a href="https://cloud.distrust.network">[clearnet]</a></small></li>