mirror of
https://github.com/YunoHost-Apps/simplex_ynh.git
synced 2024-09-03 20:26:28 +02:00
fix
This commit is contained in:
parent
308b0f1b3b
commit
e3807fbf2b
5 changed files with 16 additions and 31 deletions
33
conf/torrc
33
conf/torrc
|
@ -1,24 +1,9 @@
|
|||
BridgeRelay 1
|
||||
|
||||
# Replace "TODO1" with a Tor port of your choice.
|
||||
# This port must be externally reachable.
|
||||
# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port.
|
||||
ORPort __PORT_OR__
|
||||
|
||||
ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
|
||||
|
||||
# Replace "TODO2" with an obfs4 port of your choice.
|
||||
# This port must be externally reachable and must be different from the one specified for ORPort.
|
||||
# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port.
|
||||
ServerTransportListenAddr obfs4 0.0.0.0:__PORT_OBFS4__
|
||||
|
||||
# Local communication port between Tor and obfs4. Always set this to "auto".
|
||||
# "Ext" means "extended", not "external". Don't try to set a specific port number, nor listen on 0.0.0.0.
|
||||
ExtORPort auto
|
||||
|
||||
# Replace "<address@email.com>" with your email address so we can contact you if there are problems with your bridge.
|
||||
# This is optional but encouraged.
|
||||
#ContactInfo _CONTACT_
|
||||
|
||||
# Pick a nickname that you like for your bridge. This is optional.
|
||||
#Nickname _NICKNAME_
|
||||
# Enable log (otherwise, tor doesn't seemd to deploy onion address)
|
||||
Log notice file /var/log/tor/notices.log
|
||||
# Enable single hop routing (2 options below are dependencies of third). Will reduce latency in exchange of anonimity (since tor runs alongside xftp-server and onion address will be displayed in clients, this is totally fine)
|
||||
SOCKSPort 0
|
||||
HiddenServiceNonAnonymousMode 1
|
||||
HiddenServiceSingleHopMode 1
|
||||
# xftp-server hidden service host directory and port mappings
|
||||
HiddenServiceDir /var/lib/tor/simplex-xftp/
|
||||
HiddenServicePort 443 localhost:443
|
|
@ -59,10 +59,10 @@ ram.runtime = "50M"
|
|||
xftp.default = 5224
|
||||
xftp.exposed = "TCP"
|
||||
|
||||
or.default = 9002
|
||||
or.exposed = "Both"
|
||||
obfs4.default = 9003
|
||||
obfs4.exposed = "Both"
|
||||
#or.default = 9002
|
||||
#or.exposed = "Both"
|
||||
#obfs4.default = 9003
|
||||
#obfs4.exposed = "Both"
|
||||
|
||||
[resources.system_user]
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ ynh_add_systemd_config --service=xftp --template=../conf/xftp.systemd.service
|
|||
|
||||
yunohost service add $app --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port"
|
||||
yunohost service add xftp --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_xftp"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" #--needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
|
@ -53,7 +53,7 @@ systemctl enable xftp.service --quiet
|
|||
|
||||
yunohost service add $app --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port"
|
||||
yunohost service add xftp --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_xftp"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" #--needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
|
@ -93,7 +93,7 @@ ynh_add_systemd_config --service=xftp --template=../conf/xftp.systemd.service
|
|||
|
||||
yunohost service add $app --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port"
|
||||
yunohost service add xftp --description="Messaging platform" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_xftp"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" --needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
yunohost service add tor --description="Tor Relay" --log="/var/log/$app/$app.log" #--needs_exposed_ports="$port_or" --test_status="pgrep tor"
|
||||
|
||||
#=================================================
|
||||
# START SYSTEMD SERVICE
|
||||
|
|
Loading…
Add table
Reference in a new issue