site and .onion tweaks

This commit is contained in:
root 2025-11-04 19:28:28 +00:00
parent 8a5781e2ba
commit 8e5f6991f9
6 changed files with 10 additions and 4 deletions

View file

@ -43,6 +43,7 @@ in {
caddy.virtualHosts."https://social.distrust.network ${onionUrl}".extraConfig = '' caddy.virtualHosts."https://social.distrust.network ${onionUrl}".extraConfig = ''
reverse_proxy localhost:${toString fediPort} reverse_proxy localhost:${toString fediPort}
header Onion-Loction ${onionUrl}
''; '';
tor.relay.onionServices."akkoma".map = [ tor.relay.onionServices."akkoma".map = [

View file

@ -16,6 +16,7 @@ in {
caddy.virtualHosts."https://git.distrust.network ${onionUrl}".extraConfig = '' caddy.virtualHosts."https://git.distrust.network ${onionUrl}".extraConfig = ''
reverse_proxy localhost:${toString forgejoPort} reverse_proxy localhost:${toString forgejoPort}
header Onion-Location ${onionUrl}
''; '';
tor.relay.onionServices."forgejo".map = [ tor.relay.onionServices."forgejo".map = [

View file

@ -4,7 +4,8 @@
lib, lib,
... ...
}: let }: let
onionUrl = "http://znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion"; onionDomain = "znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion";
onionUrl = "http://${onionDomain}";
in { in {
age.secrets."nextcloud-admin-pass".file = ../secrets/nextcloud-admin-pass; age.secrets."nextcloud-admin-pass".file = ../secrets/nextcloud-admin-pass;
@ -14,7 +15,7 @@ in {
enable = true; enable = true;
hostName = "cloud.distrust.network"; hostName = "cloud.distrust.network";
settings = { settings = {
trusted_domains = ["znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion"]; trusted_domains = [onionDomain];
trusted_proxies = ["127.0.0.1"]; trusted_proxies = ["127.0.0.1"];
maintenance_window_start = 1; maintenance_window_start = 1;
}; };
@ -63,6 +64,7 @@ in {
X-Forwarded-For {remote_host} X-Forwarded-For {remote_host}
X-Forwarded-Proto {scheme} X-Forwarded-Proto {scheme}
X-Forwarded-Host {host} X-Forwarded-Host {host}
Onion-Loation ${onionUrl}
} }

View file

@ -1,10 +1,11 @@
let let
onionUrl = "http://nzmkihvxjazbb3fgu7drbklpt6ibg4suff4glxpadhrd4pf5wd2od5yd.onion"; onionUrl = "http://distrustdtp5qgbk2firlzfkkmu5p6v6acuh2ox454zd2i3ujdqad5yd.onion";
in { in {
services.caddy.virtualHosts = { services.caddy.virtualHosts = {
"https://distrust.network ${onionUrl}".extraConfig = '' "https://distrust.network ${onionUrl}".extraConfig = ''
root * /etc/nixos/site root * /etc/nixos/site
file_server file_server
header Onion-Location ${onionUrl}
''; '';
}; };

View file

@ -16,6 +16,7 @@ in {
caddy.virtualHosts."https://vault.distrust.network ${onionUrl}".extraConfig = '' caddy.virtualHosts."https://vault.distrust.network ${onionUrl}".extraConfig = ''
reverse_proxy localhost:${toString vaultPort} reverse_proxy localhost:${toString vaultPort}
header Onion-Location ${onionUrl}
''; '';
tor.relay.onionServices."vaultwarden".map = [ tor.relay.onionServices."vaultwarden".map = [

View file

@ -44,7 +44,7 @@
<p><code>distrust.network</code> works off one simple principle:</p> <p><code>distrust.network</code> works off one simple principle:</p>
<i>> I don't know you, and I don't want to.</i> <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>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> <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>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> <li>Nextcloud (10GB) <small><a href="http://znfdxs4e3rqvzxtkksiidomupgm2x44wtrzyxtpomczto3xg5qxpcbqd.onion/login">[tor]</a> <a href="https://cloud.distrust.network">[clearnet]</a></small></li>