nlv: Reboot with lid closed. 2 tor nodes.

This commit is contained in:
Ole Tange 2024-08-16 22:26:23 +02:00
parent a10b619fc7
commit e4da78fd38
6 changed files with 257 additions and 1996 deletions

14
nlv/etc/rc.local Executable file
View file

@ -0,0 +1,14 @@
#!/bin/bash
setup_static() {
# Plug eth0 in bridged port on ap
ifconfig enp0s25:0 193.106.166.105 netmask 255.255.255.192
route del default gw 193.106.166.65 2>/dev/null
route add default gw 193.106.166.65
}
setup_static
start_tor2() {
/usr/bin/tor --defaults-torrc /usr/share/tor/tor-service-defaults-torrc -f /etc/tor/torrc2 --RunAsDaemon 1
}
start_tor2

View file

@ -1,15 +1,18 @@
# This file is part of systemd. # This file is part of systemd.
# #
# systemd is free software; you can redistribute it and/or modify it # systemd is free software; you can redistribute it and/or modify it under the
# under the terms of the GNU Lesser General Public License as published by # terms of the GNU Lesser General Public License as published by the Free
# the Free Software Foundation; either version 2.1 of the License, or # Software Foundation; either version 2.1 of the License, or (at your option)
# (at your option) any later version. # any later version.
# #
# Entries in this file show the compile time defaults. # Entries in this file show the compile time defaults. Local configuration
# You can change settings by editing this file. # should be created by either modifying this file (or a copy of it placed in
# Defaults can be restored by simply deleting this file. # /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in
# the /etc/systemd/logind.conf.d/ directory. The latter is generally
# recommended. Defaults can be restored by simply deleting the main
# configuration file and all drop-ins located in /etc/.
# #
# Activate settings with `systemctl restart systemd-logind` # Use 'systemd-analyze cat-config systemd/logind.conf' to display the full config.
# #
# See logind.conf(5) for details. # See logind.conf(5) for details.
@ -20,8 +23,13 @@
#KillOnlyUsers= #KillOnlyUsers=
#KillExcludeUsers=root #KillExcludeUsers=root
#InhibitDelayMaxSec=5 #InhibitDelayMaxSec=5
#UserStopDelaySec=10
#HandlePowerKey=poweroff #HandlePowerKey=poweroff
#HandlePowerKeyLongPress=ignore
#HandleRebootKey=reboot
#HandleRebootKeyLongPress=poweroff
#HandleSuspendKey=suspend #HandleSuspendKey=suspend
#HandleSuspendKeyLongPress=hibernate
#HandleHibernateKey=hibernate #HandleHibernateKey=hibernate
HandleLidSwitch=ignore HandleLidSwitch=ignore
HandleLidSwitchExternalPower=ignore HandleLidSwitchExternalPower=ignore
@ -30,10 +38,13 @@ HandleLidSwitchDocked=ignore
#SuspendKeyIgnoreInhibited=no #SuspendKeyIgnoreInhibited=no
#HibernateKeyIgnoreInhibited=no #HibernateKeyIgnoreInhibited=no
#LidSwitchIgnoreInhibited=yes #LidSwitchIgnoreInhibited=yes
#RebootKeyIgnoreInhibited=no
#HoldoffTimeoutSec=30s #HoldoffTimeoutSec=30s
IdleAction=ignore IdleAction=ignore
IdleActionSec=1min IdleActionSec=1min
#RuntimeDirectorySize=10% #RuntimeDirectorySize=10%
#RuntimeDirectoryInodesMax=
#RemoveIPC=yes #RemoveIPC=yes
#InhibitorsMax=8192 #InhibitorsMax=8192
#SessionsMax=8192 #SessionsMax=8192
#StopIdleSessionSec=infinity

View file

@ -1,25 +1,27 @@
# This file is part of systemd. # This file is part of systemd.
# #
# systemd is free software; you can redistribute it and/or modify it # systemd is free software; you can redistribute it and/or modify it under the
# under the terms of the GNU Lesser General Public License as published by # terms of the GNU Lesser General Public License as published by the Free
# the Free Software Foundation; either version 2.1 of the License, or # Software Foundation; either version 2.1 of the License, or (at your option)
# (at your option) any later version. # any later version.
# #
# Entries in this file show the compile time defaults. # Entries in this file show the compile time defaults. Local configuration
# You can change settings by editing this file. # should be created by either modifying this file (or a copy of it placed in
# Defaults can be restored by simply deleting this file. # /etc/ if the original file is shipped in /usr/), or by creating "drop-ins" in
# the /etc/systemd/sleep.conf.d/ directory. The latter is generally
# recommended. Defaults can be restored by simply deleting the main
# configuration file and all drop-ins located in /etc/.
# #
# See systemd-sleep.conf(5) for details # Use 'systemd-analyze cat-config systemd/sleep.conf' to display the full config.
#
# See systemd-sleep.conf(5) for details.
[Sleep] [Sleep]
AllowSuspend=no AllowSuspend=no
#AllowHibernation=yes #AllowHibernation=yes
AllowSuspendThenHibernate=no AllowSuspendThenHibernate=no
#AllowHybridSleep=yes #AllowHybridSleep=yes
#SuspendMode=
#SuspendState=mem standby freeze #SuspendState=mem standby freeze
#HibernateMode=platform shutdown #HibernateMode=platform shutdown
#HibernateState=disk #HibernateDelaySec=
#HybridSleepMode=suspend platform shutdown #SuspendEstimationSec=60min
#HybridSleepState=disk
#HibernateDelaySec=180min

File diff suppressed because it is too large Load diff

204
nlv/etc/tor/torrc2 Normal file
View file

@ -0,0 +1,204 @@
## Configuration file for a typical Tor user
## Last updated 9 October 2013 for Tor 0.2.5.2-alpha.
## (may or may not work for much older or much newer versions of Tor.)
##
## Lines that begin with "## " try to explain what's going on. Lines
## that begin with just "#" are disabled commands: you can enable them
## by removing the "#" symbol.
##
## See 'man tor', or https://www.torproject.org/docs/tor-manual.html,
## for more options you can use in this file.
##
## Tor will look for this file in various places based on your platform:
## https://www.torproject.org/docs/faq#torrc
## Tor opens a socks proxy on port 9050 by default -- even if you don't
## configure one below. Set "SocksPort 0" if you plan to run Tor only
## as a relay, and not make any local application connections yourself.
SocksPort 29050 # Default: Bind to localhost:9050 for local connections.
#SocksPort 192.168.0.1:9100 # Bind to this address:port too.
## Entry policies to allow/deny SOCKS requests based on IP address.
## First entry that matches wins. If no SocksPolicy is set, we accept
## all (and only) requests that reach a SocksPort. Untrusted users who
## can access your SocksPort may be able to learn about the connections
## you make.
#SocksPolicy accept 192.168.0.0/16
#SocksPolicy reject *
## Logs go to stdout at level "notice" unless redirected by something
## else, like one of the below lines. You can have as many Log lines as
## you want.
##
## We advise using "notice" in most cases, since anything more verbose
## may provide sensitive information to an attacker who obtains the logs.
##
## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
Log notice file /var/log/tor/notices2.log
## Send every possible message to /var/log/tor/debug.log
#Log debug file /var/log/tor/debug2.log
## Use the system log instead of Tor's logfiles
#Log notice syslog
## To send all messages to stderr:
#Log debug stderr
## Uncomment this to start the process in the background... or use
## --runasdaemon 1 on the command line. This is ignored on Windows;
## see the FAQ entry if you want Tor to run as an NT service.
RunAsDaemon 1
## The directory for keeping all the keys/etc. By default, we store
## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
DataDirectory /var/lib/tor2
## The port on which Tor will listen for local connections from Tor
## controller applications, as documented in control-spec.txt.
ControlPort 29051
## If you enable the controlport, be sure to enable one of these
## authentication methods, to prevent attackers from accessing it.
#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C
#CookieAuthentication 1
############### This section is just for location-hidden services ###
## Once you have configured a hidden service, you can look at the
## contents of the file ".../hidden_service/hostname" for the address
## to tell people.
##
## HiddenServicePort x y:z says to redirect requests on port x to the
## address y:z.
#HiddenServiceDir /var/lib/tor/hidden_service/
#HiddenServicePort 80 127.0.0.1:80
#HiddenServicePort 22 127.0.0.1:22
#HiddenServiceDir /var/lib/tor/other_hidden_service/
#HiddenServicePort 80 127.0.0.1:80
################ This section is just for relays #####################
#
## See https://www.torproject.org/docs/tor-doc-relay for details.
## Required: what port to advertise for incoming Tor connections.
ORPort 29001
## If you want to listen on a port other than the one advertised in
## ORPort (e.g. to advertise 443 but bind to 9090), you can do it as
## follows. You'll need to do ipchains or other port forwarding
## yourself to make this work.
#ORPort 443 NoListen
#ORPort 127.0.0.1:9090 NoAdvertise
## The IP address or full DNS name for incoming connections to your
## relay. Leave commented out and Tor will guess.
Address 193.106.166.105
#Address nlv.pi.dk
## If you have multiple network interfaces, you can specify one for
## outgoing traffic to use.
# OutboundBindAddress 10.0.0.5
## A handle for your relay, so people don't have to refer to it by key.
Nickname TangeNLV2
## Define these to limit how much relayed traffic you will allow. Your
## own traffic is still unthrottled. Note that RelayBandwidthRate must
## be at least 20 KB.
## Note that units for these config options are bytes per second, not bits
## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc.
#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps)
#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
#Prøv tom
#RelayBandwidthRate 8 MBytes
#RelayBandwidthBurst 10 MBytes
# Giver 80 Mbits
#RelayBandwidthRate 80 MBytes
#RelayBandwidthBurst 100 MBytes
RelayBandwidthRate 180 MBytes
RelayBandwidthBurst 200 MBytes
## Use these to restrict the maximum traffic per day, week, or month.
## Note that this threshold applies separately to sent and received bytes,
## not to their sum: setting "4 GB" may allow up to 8 GB total before
## hibernating.
##
## Set a maximum of 4 gigabytes each way per period.
#AccountingMax 4 GB
## Each period starts daily at midnight (AccountingMax is per day)
#AccountingStart day 00:00
## Each period starts on the 3rd of the month at 15:00 (AccountingMax
## is per month)
#AccountingStart month 3 15:00
## Administrative contact information for this relay or bridge. This line
## can be used to contact you if your relay or bridge is misconfigured or
## something else goes wrong. Note that we archive and publish all
## descriptors containing these lines and that Google indexes them, so
## spammers might also collect them. You may want to obscure the fact that
## it's an email address and/or generate a new address for this purpose.
#ContactInfo Random Person <nobody AT example dot com>
## You might also include your PGP or GPG fingerprint if you have one:
ContactInfo 0x88888888 Ole Tange <ole@tange.dk>
## Uncomment this to mirror directory information for others. Please do
## if you have enough bandwidth.
DirPort 29030 # what port to advertise for directory connections
## If you want to listen on a port other than the one advertised in
## DirPort (e.g. to advertise 80 but bind to 9091), you can do it as
## follows. below too. You'll need to do ipchains or other port
## forwarding yourself to make this work.
#DirPort 80 NoListen
#DirPort 127.0.0.1:9091 NoAdvertise
## Uncomment to return an arbitrary blob of html on your DirPort. Now you
## can explain what Tor is if anybody wonders why your IP address is
## contacting them. See contrib/tor-exit-notice.html in Tor's source
## distribution for a sample.
DirPortFrontPage /etc/tor/tor-exit-notice.html
## Uncomment this if you run more than one Tor relay, and add the identity
## key fingerprint of each Tor relay you control, even if they're on
## different networks. You declare it here so Tor clients can avoid
## using more than one of your relays in a single circuit. See
## https://www.torproject.org/docs/faq#MultipleRelays
## However, you should never include a bridge's fingerprint here, as it would
## break its concealability and potentionally reveal its IP/TCP address.
MyFamily 547C1CDB516798EC66A01F04A5884DCE1A151919,63C6AB74A5C288C2159DDC783BB00F88AB44427C
## A comma-separated list of exit policies. They're considered first
## to last, and the first match wins. If you want to _replace_
## the default exit policy, end this with either a reject *:* or an
## accept *:*. Otherwise, you're _augmenting_ (prepending to) the
## default exit policy. Leave commented to just use the default, which is
## described in the man page or at
## https://www.torproject.org/documentation.html
##
## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
## for issues you might encounter if you use the default exit policy.
##
## If certain IPs and ports are blocked externally, e.g. by your firewall,
## you should update your exit policy to reflect this -- otherwise Tor
## users will be told that those destinations are down.
##
## For security, by default Tor rejects connections to private (local)
## networks, including to your public IP address. See the man page entry
## for ExitPolicyRejectPrivate if you want to allow "exit enclaving".
##
#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
#ExitPolicy accept *:119 # accept nntp as well as default exit policy
ExitPolicy reject *:* # no exits allowed
#ExitPolicy accept *:* # no exits allowed
## Bridge relays (or "bridges") are Tor relays that aren't listed in the
## main directory. Since there is no complete public list of them, even an
## ISP that filters connections to all the known Tor relays probably
## won't be able to block all the bridges. Also, websites won't treat you
## differently because they won't know you're running Tor. If you can
## be a real relay, please do; but if not, be a bridge!
#BridgeRelay 1
## By default, Tor will advertise your bridge to users through various
## mechanisms like https://bridges.torproject.org/. If you want to run
## a private bridge, for example because you'll give out your bridge
## address manually to your friends, uncomment this line:
#PublishServerDescriptor 0
HardwareAccel 1
NumCPUs 4

View file

@ -42,3 +42,7 @@ OnionAddrRange 127.42.42.0/24
# If set, the SOCKS5Username and SOCKS5Password options must not be set. # If set, the SOCKS5Username and SOCKS5Password options must not be set.
# (Default: 0) # (Default: 0)
#IsolatePID 1 #IsolatePID 1
# Enable IPv6 support in torsocks. torsocks IPv6 support is currently incomplete
# and can have some tricky failure modes.
#EnableIPv6 1