heierbtc/citadel-core
1
0
Fork 0
forked from michael.heier/citadel-core
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tor for some users

Browse Source
This commit is contained in:
Aaron Dewes 2021-11-17 18:24:07 +00:00
parent ca1a3e4d25
commit a6d1530ca3
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/configure vendored
View File

@ -10,6 +10,7 @@ from lib.rpcauth import get_data
import re import re
import subprocess import subprocess
import json import json
import shutil
# Print an error if the user isn't running on Linux. # Print an error if the user isn't running on Linux.
if sys.platform != 'linux': if sys.platform != 'linux':
@ -300,9 +301,7 @@ def replace_vars(file_path):
return re.sub(r'<(.*?)>', lambda m: get_var(convert_to_upper(m.group(1)), locals(), file_path), file_contents) return re.sub(r'<(.*?)>', lambda m: get_var(convert_to_upper(m.group(1)), locals(), file_path), file_contents)
templates_to_build = { templates_to_build = {
"./templates/torrc-empty": "./tor/torrc-apps", "./templates/torrc-empty": ["./tor/torrc-apps", "./tor/torrc-apps-2", "./tor/torrc-apps-3"],
"./templates/torrc-empty": "./tor/torrc-apps-2",
"./templates/torrc-empty": "./tor/torrc-apps-3",
"./templates/torrc-core-sample": "./tor/torrc-core", "./templates/torrc-core-sample": "./tor/torrc-core",
"./templates/lnd-sample.conf": "./lnd/lnd.conf", "./templates/lnd-sample.conf": "./lnd/lnd.conf",
"./templates/bitcoin-sample.conf": "./bitcoin/bitcoin.conf", "./templates/bitcoin-sample.conf": "./bitcoin/bitcoin.conf",
@ -311,16 +310,30 @@ templates_to_build = {
"./templates/nginx-sample.conf": "./nginx/nginx.conf" "./templates/nginx-sample.conf": "./nginx/nginx.conf"
} }
print("Generating configuration files") print("Generating configuration files...")
print() print()
# Loop through templates_to_build and build them # Loop through templates_to_build and build them
for template_path, output_path in templates_to_build.items(): for template_path, output_path in templates_to_build.items():
data = replace_vars(template_path) data = replace_vars(template_path)
if data != "" and data != None: # If output path is a list, then it is a list of output paths
if isinstance(output_path, list):
for output_path_item in output_path:
# Delete the output path, no matter if it's a file or a directory
if os.path.isdir(output_path_item):
shutil.rmtree(output_path_item)
with open(output_path_item, 'w') as file:
file.write(data)
else:
# Delete the output path, no matter if it's a file or a directory
if os.path.isdir(output_path):
shutil.rmtree(output_path)
with open(output_path, 'w') as file: with open(output_path, 'w') as file:
file.write(data) file.write(data)
print("Generated configuration files")
print()
print("Installing docker-compose...") print("Installing docker-compose...")
print() print()
download_docker_compose() download_docker_compose()