Remove TOR_HOME variable in prod/install

This commit is contained in:
wiz 2022-07-30 15:32:51 +02:00
parent 8f183945c0
commit 8d1624476f
No known key found for this signature in database
GPG Key ID: A394E332255A6173

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
@ -985,7 +983,7 @@ 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}" osSudo "${ROOT_USER}" sed -i.orig "s!__TOR_RESOURCES__!${TOR_RESOURCES}!" "${TOR_CONFIGURATION}"
echo "[*] Adding Tor HS configuration for Mempool" echo "[*] Adding Tor HS configuration for Mempool"