From 07f1033a7be7b8ddb5483c1144e4f730833fdc1e Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Tue, 22 Jul 2025 09:45:28 +0300 Subject: [PATCH] tor: separate MapAddress directives to torrc.d with help from the include directive --- etc/tor/torrc-client | 18 ++---------------- etc/tor/torrc.d/mapaddress.conf | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 etc/tor/torrc.d/mapaddress.conf diff --git a/etc/tor/torrc-client b/etc/tor/torrc-client index ae5f31ad..078942fb 100644 --- a/etc/tor/torrc-client +++ b/etc/tor/torrc-client @@ -34,22 +34,8 @@ ClientUseIPv6 1 # in a DS network preventing Tor over IPv4. ClientPreferIPv6ORPort 1 -## Mapping clearnet domains to onions for certificate validation if -## accessed through Tor -# My personal server, most likely used for IRC -MapAddress etro.mikaela.info otzmigofmchtadpek223bkmrzqoa6mmvhmr5dxqurcrtwalizfibuxid.onion -# I setup this being operator, also on MOTD -MapAddress irc.pirateirc.net cbmtec5xuhpjwjq245kpp5jk2wij63ydgu5vwbxvdamzibfubc5uzaqd.onion -# https://liberta.casa/ confirmed from oper -MapAddress irc.liberta.casa cr36xbvmgjwnfw4sly4kuc6c3ozhesjre3y5pggq5xdkkmbrq6dz4fad.onion -# Ergo IRCd's home, confirmed from channel -MapAddress irc.ergo.chat vrw7zcuarwx4oeju3iikiz3jffrvuijsysyznqf53mxizxrebomfnrid.onion -# Heard from staffer, also https://libera.chat/guides/connect#verifying-tor-tls-connections -MapAddress palladium.libera.chat libera75jm6of4wxpxt4aynol3xjmbtxgfyjpu34ss4d7r7q2v5zrpyd.onion -# https://www.oftc.net/Tor/ -MapAddress irc.oftc.net oftcnet6xg6roj6d7id4y4cu6dchysacqj2ldgea73qzdagufflqxrid.onion -# From operator and their MOTD -MapAddress irc.hybridirc.com xtciv7bmnkb5afqsryowaejcerqmajsginkhkgtq6heiehu2ig7gdkid.onion +# MapAddress directives have been thrown to a dedicated file +%include /etc/torrc.d/mapaddress.conf # Disable control access #ControlPort 0 diff --git a/etc/tor/torrc.d/mapaddress.conf b/etc/tor/torrc.d/mapaddress.conf new file mode 100644 index 00000000..5b2d7977 --- /dev/null +++ b/etc/tor/torrc.d/mapaddress.conf @@ -0,0 +1,16 @@ +## Mapping clearnet domains to onions for certificate validation if +## accessed through Tor +# My personal server, most likely used for IRC +MapAddress etro.mikaela.info otzmigofmchtadpek223bkmrzqoa6mmvhmr5dxqurcrtwalizfibuxid.onion +# I setup this being operator, also on MOTD +MapAddress irc.pirateirc.net cbmtec5xuhpjwjq245kpp5jk2wij63ydgu5vwbxvdamzibfubc5uzaqd.onion +# https://liberta.casa/ confirmed from oper +MapAddress irc.liberta.casa cr36xbvmgjwnfw4sly4kuc6c3ozhesjre3y5pggq5xdkkmbrq6dz4fad.onion +# Ergo IRCd's home, confirmed from channel +MapAddress irc.ergo.chat vrw7zcuarwx4oeju3iikiz3jffrvuijsysyznqf53mxizxrebomfnrid.onion +# Heard from staffer, also https://libera.chat/guides/connect#verifying-tor-tls-connections +MapAddress palladium.libera.chat libera75jm6of4wxpxt4aynol3xjmbtxgfyjpu34ss4d7r7q2v5zrpyd.onion +# https://www.oftc.net/Tor/ +MapAddress irc.oftc.net oftcnet6xg6roj6d7id4y4cu6dchysacqj2ldgea73qzdagufflqxrid.onion +# From operator and their MOTD +MapAddress irc.hybridirc.com xtciv7bmnkb5afqsryowaejcerqmajsginkhkgtq6heiehu2ig7gdkid.onion