DO-1557 / Support Network Gateway

node-runner-cli/Dockerfile.ubuntufocal

@@ -35,9 +35,9 @@ COPY requirements.txt /app/requirements.txt
 RUN pip install -r requirements.txt
 
 COPY . /app
-RUN pyinstaller --onefile --windowed radixnode.spec
+RUN pyinstaller --onefile --windowed babylonnode.spec
 
-RUN DISABLE_VERSION_CHECK=true /app/dist/radixnode version
+RUN DISABLE_VERSION_CHECK=true /app/dist/babylonnode version
 
 FROM scratch AS export-stage
 COPY --from=BUILD /app/dist /

node-runner-cli/Dockerfile.ubuntujammy

@@ -35,9 +35,9 @@ COPY requirements.txt /app/requirements.txt
 RUN pip install -r requirements.txt
 
 COPY . /app
-RUN pyinstaller --onefile --windowed radixnode.spec
+RUN pyinstaller --onefile --windowed babylonnode.spec
 
-RUN DISABLE_VERSION_CHECK=true /app/dist/radixnode version
+RUN DISABLE_VERSION_CHECK=true /app/dist/babylonnode version
 
 FROM scratch AS export-stage
 COPY --from=BUILD /app/dist /

node-runner-cli/ansible/project/provision.yml

@@ -65,6 +65,19 @@
       when: setup_swap | bool
 
     - block:
+        - name: Ensure gpg is installed
+          apt:
+            name: gpg
+        - name: Add repository signing key
+          apt_key:
+            url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
+            state: present
+        - name: Add postgresql repository
+          apt_repository:
+            repo: "deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
+            state: present
+            filename: pgdg
+
         - name: install PostgreSQL
           ansible.builtin.package:
             name:
@@ -84,11 +97,11 @@
           become_user: "{{ postgresql_user }}"
           community.postgresql.postgresql_user:
             name: "{{ postgresql_user }}"
-            password: "{{postgress_password}}"
+            password: "{{ postgress_password }}"
 
         - name: Grant
           community.postgresql.postgresql_pg_hba:
-            dest: /etc/postgresql/12/main/pg_hba.conf
+            dest: /etc/postgresql/{{ postgresql_version }}/main/pg_hba.conf
             contype: host
             users: all
             source: 0.0.0.0/0
@@ -110,5 +123,21 @@
         - name: restart postgresql
           service: name=postgresql state=restarted enabled=yes
 
+        - name: Create the database specified in vars
+          become: true
+          become_user: "{{ postgresql_user }}"
+          postgresql_db: name={{ postgresql_db_name }}
+            template='template0'
+            state=present
+
+        - name: Ensure user has access to the new database
+          become: true
+          become_user: "{{ postgresql_user }}"
+          postgresql_user: db={{ postgresql_db_name }}
+            name={{ postgresql_user }}
+            password={{ postgress_password }}
+            priv=ALL
+            state=present
+
       become: true
-      when: postgres_local | bool
+      when: postgres_local | bool

node-runner-cli/api/Api.py

@@ -1,7 +1,7 @@
 #TODO this needs updating when a new python client is created
 import os
 
-from env_vars import PRINT_RESPONSE, NGINX, NODE_END_POINT
+from config.EnvVars import PRINT_RESPONSE, NGINX, NODE_END_POINT
 from utils.utils import Helpers
 
 

node-runner-cli/api/CustomAPIClient.py

@@ -12,7 +12,7 @@ def __init__(self, host=None, username=None, password=None, verify_ssl=True):
 
         self.verify_ssl = verify_ssl
 
-        self.user_agent = 'Babylon radixnode cli'
+        self.user_agent = 'Babylon babylonnode cli'
         self.default_headers = {}
         self.set_default_header('User-Agent', self.user_agent)
 

node-runner-cli/radixnode.py → node-runner-cli/babylonnode.py

@@ -15,7 +15,7 @@
 from commands.othercommands import other_command_cli
 from commands.systemapi import handle_systemapi
 from commands.systemdcommand import systemdcli
-from env_vars import DISABLE_VERSION_CHECK
+from config.EnvVars import DISABLE_VERSION_CHECK
 from github.github import latest_release
 from utils.utils import Helpers
 
@@ -40,13 +40,13 @@ def check_latest_cli():
         if Helpers.cli_version() != cli_latest_version:
             os_name = "ubuntu-22.04"
             print(
-                f"Radixnode CLI latest version is {cli_latest_version} and current version of the binary is {Helpers.cli_version()}.\n.")
+                f"babylonnode CLI latest version is {cli_latest_version} and current version of the binary is {Helpers.cli_version()}.\n.")
             print(f"""
                 ---------------------------------------------------------------
                 Update the CLI by running these commands
-                    wget -O radixnode https://github.com/radixdlt/babylon-nodecli/releases/download/{cli_latest_version}/radixnode-{os_name}
-                    chmod +x radixnode
-                    sudo mv radixnode /usr/local/bin
+                    wget -O babylonnode https://github.com/radixdlt/babylon-nodecli/releases/download/{cli_latest_version}/radixnode-{os_name}
+                    chmod +x babylonnode
+                    sudo mv babylonnode /usr/local/bin
                 """)
 
 

node-runner-cli/radixnode.spec → node-runner-cli/babylonnode.spec

@@ -4,7 +4,7 @@
 block_cipher = None
 
 
-a = Analysis(['radixnode.py'],
+a = Analysis(['babylonnode.py'],
              pathex=['.'],
              binaries=[],
              datas=[('./templates/*.j2', 'templates'),('./testnet-genesis/*', 'testnet-genesis')],
@@ -24,7 +24,7 @@ exe = EXE(pyz,
           a.zipfiles,
           a.datas,
           [],
-          name='radixnode',
+          name='babylonnode',
           debug=False,
           bootloader_ignore_signals=False,
           strip=False,

node-runner-cli/commands/authcommand.py

@@ -1,12 +1,12 @@
 from argparse import ArgumentParser
 
 from commands.subcommand import get_decorator, argument
-from setup.Docker import Docker
-from setup.SystemD import SystemD
+from setup.DockerSetup import DockerSetup
+from setup.SystemDSetup import SystemDSetup
 
 authcli = ArgumentParser(
     description='Subcommand to aid creation of nginx basic auth users',
-    usage="radixnode auth "
+    usage="babylonnode auth "
 )
 
 auth_parser = authcli.add_subparsers(dest="authcommand")
@@ -88,10 +88,10 @@ def set_gateway_password(args):
 
 def set_auth(args, usertype, password=None):
     if args.setupmode == "DOCKER":
-        Docker.setup_nginx_Password(usertype, args.username, password)
+        DockerSetup.setup_nginx_Password(usertype, args.username, password)
     elif args.setupmode == "SYSTEMD":
-        SystemD.checkUser()
-        SystemD.install_nginx()
-        SystemD.setup_nginx_password("/etc/nginx/secrets", usertype, args.username, password)
+        SystemDSetup.checkUser()
+        SystemDSetup.install_nginx()
+        SystemDSetup.setup_nginx_password("/etc/nginx/secrets", usertype, args.username, password)
     else:
         print("Invalid setupmode specified. It should be either DOCKER or SYSTEMD.")

node-runner-cli/commands/coreapi.py

@@ -21,7 +21,7 @@
 #
 # corecli = ArgumentParser(
 #     description='Subcommand to aid interaction with core api',
-#     usage="radixnode api core "
+#     usage="babylonnode api core "
 # )
 # core_parser = corecli.add_subparsers(dest="corecommand")
 #