machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2222 from Emzy/ops/fix-tor-freebsd

Browse Source 
Fix tor config for FreeBSD on prod installer
This commit is contained in:
wiz 2022-07-30 13:35:26 +00:00 committed by GitHub
commit 1a761e79ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
production/install
View File

@ -182,7 +182,6 @@ case $OS in
ROOT_USER=root ROOT_USER=root
ROOT_GROUP=wheel ROOT_GROUP=wheel
ROOT_HOME=/root ROOT_HOME=/root
TOR_HOME=/var/db/tor
TOR_CONFIGURATION=/usr/local/etc/tor/torrc TOR_CONFIGURATION=/usr/local/etc/tor/torrc
TOR_RESOURCES=/var/db/tor TOR_RESOURCES=/var/db/tor
TOR_PKG=tor TOR_PKG=tor
@ -198,7 +197,6 @@ case $OS in
ROOT_USER=root ROOT_USER=root
ROOT_GROUP=root ROOT_GROUP=root
ROOT_HOME=/root ROOT_HOME=/root
TOR_HOME=/etc/tor
TOR_CONFIGURATION=/etc/tor/torrc TOR_CONFIGURATION=/etc/tor/torrc
TOR_RESOURCES=/var/lib/tor TOR_RESOURCES=/var/lib/tor
TOR_PKG=tor TOR_PKG=tor
@ -282,6 +280,8 @@ BISQ_USER=bisq
BISQ_GROUP=bisq BISQ_GROUP=bisq
# bisq home folder, needs about 1GB # bisq home folder, needs about 1GB
BISQ_HOME=/bisq BISQ_HOME=/bisq
# tor HS folder
BISQ_TOR_HS=bisq
# Unfurl user/group # Unfurl user/group
UNFURL_USER=unfurl UNFURL_USER=unfurl
@ -298,6 +298,8 @@ ELEMENTS_HOME=/elements
ELECTRS_HOME=/electrs ELECTRS_HOME=/electrs
# elements electrs source/binaries # elements electrs source/binaries
ELEMENTS_ELECTRS_HOME=${ELEMENTS_HOME}/electrs ELEMENTS_ELECTRS_HOME=${ELEMENTS_HOME}/electrs
# tor HS folder
LIQUID_TOR_HS=liquid
# minfee user/group # minfee user/group
MINFEE_USER=minfee MINFEE_USER=minfee
@ -981,15 +983,34 @@ if [ "${TOR_INSTALL}" = ON ];then
osPackageInstall "${TOR_PKG}" osPackageInstall "${TOR_PKG}"
echo "[*] Installing Tor base configuration" echo "[*] Installing Tor base configuration"
osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/torrc" "${TOR_HOME}/torrc" osSudo "${ROOT_USER}" install -c -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/torrc" "${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" sed -i.orig "s!__TOR_RESOURCES__!${TOR_RESOURCES}!" "${TOR_CONFIGURATION}"
echo "[*] Adding Tor HS configuration" echo "[*] Adding Tor HS configuration for Mempool"
if ! grep "${MEMPOOL_TOR_HS}" /etc/tor/torrc >/dev/null 2>&1;then if [ "${MEMPOOL_ENABLE}" = "ON" ];then
if ! grep "${MEMPOOL_TOR_HS}" "${TOR_CONFIGURATION}" >/dev/null 2>&1;then
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceDir ${TOR_RESOURCES}/${MEMPOOL_TOR_HS}/ >> ${TOR_CONFIGURATION}" osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceDir ${TOR_RESOURCES}/${MEMPOOL_TOR_HS}/ >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServicePort 80 127.0.0.1:81 >> ${TOR_CONFIGURATION}" osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServicePort 80 127.0.0.1:81 >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceVersion 3 >> ${TOR_CONFIGURATION}" osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceVersion 3 >> ${TOR_CONFIGURATION}"
else fi
osSudo "${ROOT_USER}" sed -i.orig "s!__TOR_RESOURCES__!${TOR_RESOURCES}!" "${TOR_CONFIGURATION}" fi
echo "[*] Adding Tor HS configuration for Bisq"
if [ "${BISQ_ENABLE}" = "ON" ];then
if ! grep "${BISQ_TOR_HS}" "${TOR_CONFIGURATION}" >/dev/null 2>&1;then
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceDir ${TOR_RESOURCES}/${BISQ_TOR_HS}/ >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServicePort 80 127.0.0.1:82 >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceVersion 3 >> ${TOR_CONFIGURATION}"
fi
fi
echo "[*] Adding Tor HS configuration for Liquid"
if [ "${LIQUID_ENABLE}" = "ON" ];then
if ! grep "${LIQUID_TOR_HS}" "${TOR_CONFIGURATION}" >/dev/null 2>&1;then
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceDir ${TOR_RESOURCES}/${LIQUID_TOR_HS}/ >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServicePort 80 127.0.0.1:83 >> ${TOR_CONFIGURATION}"
osSudo "${ROOT_USER}" /bin/sh -c "echo HiddenServiceVersion 3 >> ${TOR_CONFIGURATION}"
fi
fi fi
case $OS in case $OS in

8
production/torrc
View File

@ -13,11 +13,3 @@ CookieAuthFileGroupReadable 1
HiddenServiceDir __TOR_RESOURCES__/mempool HiddenServiceDir __TOR_RESOURCES__/mempool
HiddenServicePort 80 127.0.0.1:81 HiddenServicePort 80 127.0.0.1:81
HiddenServiceVersion 3 HiddenServiceVersion 3
HiddenServiceDir __TOR_RESOURCES__/bisq
HiddenServicePort 80 127.0.0.1:82
HiddenServiceVersion 3
HiddenServiceDir __TOR_RESOURCES__/liquid
HiddenServicePort 80 127.0.0.1:83
HiddenServiceVersion 3