add env file with installation variables

Author: yungwine

mytoninstaller/mytoninstaller.py

@@ -40,6 +40,18 @@
 from functools import partial
 
 
+def init_envs(local):
+	local.buffer.cport = int(os.getenv('VALIDATOR_CONSOLE_PORT', random.randint(2000, 65000)))
+	local.buffer.lport = int(os.getenv('LITESERVER_PORT', random.randint(2000, 65000)))
+	local.buffer.vport = int(os.getenv('VALIDATOR_PORT', random.randint(2000, 65000)))
+	local.buffer.archive_ttl = os.getenv('ARCHIVE_TTL')
+	local.buffer.state_ttl = os.getenv('STATE_TTL')
+	local.buffer.public_ip = os.getenv('PUBLIC_IP')
+	local.buffer.add_shard = os.getenv('ADD_SHARD')
+	local.buffer.archive_blocks = os.getenv('ARCHIVE_BLOCKS')
+	local.buffer.collate_shard = os.getenv('COLLATE_SHARD', '')
+
+
 def Init(local, console):
 	local.db.config.isStartOnlyOneProcess = False
 	local.db.config.logLevel = "debug"
@@ -51,9 +63,7 @@ def Init(local, console):
 	# create variables
 	local.buffer.user = get_current_user()
 	local.buffer.vuser = "validator"
-	local.buffer.cport = int(os.getenv('VALIDATOR_CONSOLE_PORT', random.randint(2000, 65000)))
-	local.buffer.lport = int(os.getenv('LITESERVER_PORT', random.randint(2000, 65000)))
-	local.buffer.vport = int(os.getenv('VALIDATOR_PORT', random.randint(2000, 65000)))
+	init_envs(local)
 
 	# this funciton injects MyPyClass instance
 	def inject_globals(func):

mytoninstaller/settings.py

@@ -47,13 +47,13 @@ def FirstNodeSettings(local):
 	vconfig_path = local.buffer.vconfig_path
 	vport = local.buffer.vport
 
-	if os.getenv('ARCHIVE_TTL'):
-		archive_ttl = int(os.getenv('ARCHIVE_TTL'))
+	if local.buffer.archive_ttl is not None:
+		archive_ttl = int(local.buffer.archive_ttl)
 	else:
 		archive_ttl = 2592000 if local.buffer.mode == 'liteserver' else 86400
 	state_ttl = None
-	if os.getenv('STATE_TTL'):
-		state_ttl = int(os.getenv('STATE_TTL'))
+	if local.buffer.state_ttl is not None:
+		state_ttl = int(local.buffer.state_ttl)
 		archive_ttl -= state_ttl
 	if archive_ttl == 0:
 		archive_ttl = 1  # todo: remove this when archive_ttl==0 will be allowed in node
@@ -93,16 +93,16 @@ def FirstNodeSettings(local):
 	cmd = f"{validatorAppPath} --threads {cpus} --daemonize --global-config {globalConfigPath} --db {ton_db_dir} --logname {tonLogPath} --verbosity 1"
 	cmd += ttl_cmd
 
-	if os.getenv('ADD_SHARD'):
-		add_shard = os.getenv('ADD_SHARD')
+	if local.buffer.add_shard is not None:
+		add_shard = local.buffer.add_shard
 		cmd += f' -M'
 		for shard in add_shard.split():
 			cmd += f' --add-shard {shard}'
 
 	add2systemd(name="validator", user=vuser, start=cmd, pre='/bin/sleep 2') # post="/usr/bin/python3 /usr/src/mytonctrl/mytoncore.py -e \"validator down\""
 
-	if os.getenv('PUBLIC_IP'):
-		ip = os.getenv('PUBLIC_IP')
+	if local.buffer.public_ip is not None:
+		ip = local.buffer.public_ip
 	else:
 		ip = get_own_ip()
 	addr = "{ip}:{vport}".format(ip=ip, vport=vport)
@@ -204,13 +204,13 @@ def parse_block_value(local, block: str):
 
 
 def download_archive_from_ts(local):
-	archive_blocks = os.getenv('ARCHIVE_BLOCKS')
+	if local.buffer.archive_blocks is None:
+		return
+	archive_blocks = local.buffer.archive_blocks
 	downloads_path = '/var/ton-work/ts-downloads/'
 	os.makedirs(downloads_path, exist_ok=True)
 	subprocess.run(["chmod", "o+wx", downloads_path])
 
-	if archive_blocks is None:
-		return
 	block_from, block_to = archive_blocks, None
 	if len(archive_blocks.split()) > 1:
 		block_from, block_to = archive_blocks.split()
@@ -1189,7 +1189,7 @@ def SetInitialSync(local):
 def SetupCollator(local):
 	if local.buffer.mode != "collator":
 		return
-	shards = os.getenv('COLLATE_SHARD', '').split()
+	shards = local.buffer.collate_shard.split()
 	if not shards:
 		shards = ['0:8000000000000000']
 	local.add_log(f"Setting up collator for shards: {shards}", "info")

scripts/install.sh

@@ -23,6 +23,7 @@ config_overridden=false
 show_help_and_exit() {
     echo 'Supported arguments:'
     echo ' -c, --config  URL             Provide custom network config'
+    echo ' -e, --env-file  PATH          Provide env file with installation parameters'
     echo ' -t, --telemetry               Disable telemetry'
     echo ' -i, --ignore-reqs             Ignore minimum requirements'
     echo ' -d, --dump                    Use pre-packaged dump. Reduces duration of initial synchronization.'
@@ -47,6 +48,7 @@ fi
 
 # node install parameters
 config="https://ton-blockchain.github.io/global.config.json"
+env_file=""
 telemetry=true
 ignore=false
 dump=false
@@ -77,7 +79,7 @@ while (($#)); do
     --ignore-reqs)  newargv+=(-i) ;;
 
     # with arg
-    --config|--author|--repo|--branch|--mode|--network|--node-repo|--backup|--user)
+    --config|--author|--repo|--branch|--mode|--network|--node-repo|--backup|--user|--node-version|--env-file)
       if (($# < 2)); then
         echo "Error: option $1 requires value" >&2; exit 2
       fi
@@ -92,6 +94,7 @@ while (($#)); do
         --backup)       newargv+=(-p "$2") ;;
         --user)         newargv+=(-u "$2") ;;
         --node-version) newargv+=(-v "$2") ;;
+        --env-file)     newargv+=(-e "$2") ;;
       esac
       shift ;;
     --*)
@@ -106,7 +109,7 @@ done
 #printf '\n'
 set -- "${newargv[@]}"
 
-while getopts ":c:tidola:r:b:m:n:v:u:p:g:h" flag; do
+while getopts ":c:tidola:r:b:m:n:v:u:p:g:e:h" flag; do
     case "${flag}" in
         c) config=${OPTARG}; config_overridden=true;;
         t) telemetry=false;;
@@ -123,13 +126,23 @@ while getopts ":c:tidola:r:b:m:n:v:u:p:g:h" flag; do
         o) only_mtc=true;;
         l) only_node=true;;
         p) backup=${OPTARG};;
+        e) env_file=${OPTARG};;
         h) show_help_and_exit;;
         *)
             echo "Flag -${flag} is not recognized. Aborting"
         exit 1 ;;
     esac
 done
 
+if [ -n "$env_file" ]; then
+  if [ ! -f "$env_file" ]; then
+    echo "Env file not found, aborting."
+    exit 1
+  fi
+  set -a
+  source "$env_file"
+  set +a
+fi
 
 if [ "$only_mtc" = true ] && [ "$backup" = "none" ]; then
     echo "Backup file must be provided if only mtc installation"