Update worldmap (webmap) version

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+RUN apt-get update \
+    && apt-get install -y python3 python3-pip \
+    && pip3 install --upgrade pip virtualenv

.devcontainer/devcontainer.json

@@ -0,0 +1,51 @@
+// For format details, see https://aka.ms/devcontainer.json.
+// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+    "name": "FTS-Install",
+    // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+    "build": {
+        // Path is relative to the devcontainer.json file.
+        "dockerfile": "Dockerfile",
+        "context": "."
+    },
+
+    // Features to add to the dev container.  ore info: https://containers.dev/features.
+    "features": {
+          "ghcr.io/devcontainers/features/common-utils:2": {
+              "installZsh": "true",
+              "username": "vscode",
+              "userUid": "1000",
+              "userGid": "1000",
+              "upgradePackages": "true"
+          },
+          "ghcr.io/devcontainers/features/git:1": {
+              "version": "latest",
+              "ppa": "false"
+          }
+      },
+
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // "postCreateCommand": "uname -a",
+
+    // Configure tool-specific properties.
+    "customizations" : {
+      "jetbrains" : {
+        "backend" : "IntelliJ"
+      }
+    },
+    "runArgs": [
+      "--net", "host",
+      "-e", "DISPLAY=:0",
+      "-e", "XAUTHORITY=/tmp/.Xauthority",
+      "-v", "${localEnv:HOME}/.Xauthority:/tmp/.Xauthority"
+    ],
+    "containerEnv": {
+      "DISPLAY": "unix:0"
+    },
+
+    // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    // "remoteUser": "root"
+  }

.gitignore

@@ -60,7 +60,7 @@ terraform.rc
 
 # ansible
 ansible_log.rb
-ansible.cfg
+
 /.vagrant/bundler/global.sol
 /.vagrant/machines/default/digital_ocean/action_provision
 /.vagrant/machines/default/digital_ocean/creator_uid
@@ -72,3 +72,9 @@ ansible.cfg
 /.vagrant/*
 /.byebug_history
 /docs/DEV.md
+
+apt_inst.so
+apt_pkg.so
+
+git-error-*
+

docs/ubuntu-test-container.md

@@ -0,0 +1,109 @@
+# Testing FTS Zero Touch Installer on Ubuntu 
+
+Obviously, the ZTI can be tested in a clean native Ubuntu environment.
+However, setting up such an environment can consume time.
+So, while in a production environment, running FTS on dedicated hardware is the correct choice,
+in a test environment it is more appropriate to use a container.
+
+## Setting up the container
+
+The test container can be constructed with any number of technologies.
+
+[Distrobox](https://wiki.archlinux.org/title/Distrobox)
+[Ptyrix](https://flathub.org/apps/app.devsuite.Ptyxis)
+[Boxbuddy](https://flathub.org/apps/io.github.dvlv.boxbuddyrs)
+
+We will want to specify a specific Ubuntu version we want `v22.04`.
+```shell
+distrobox create --image ubuntu:22.04 --name fts-test-install --yes \
+  --init --additional-packages "systemd libpam-systemd pipewire-audio-client-libraries" 
+```
+
+Enter the container
+```shell
+distrobox enter --name fts-test-install
+```
+
+## Use Zero Touch Intallation (ZTI)
+
+Note: The following steps may be modified to accommodate your situation.
+
+### The Working Repository
+
+The project working directory is mounted into the distrobox.
+The following is an example:
+```bash
+cd ./Projects/fts-install
+export MY_WD=$(pwd)
+```
+
+Your test will probably need the locally known IP address.
+You may change the configured IP address later,
+but it is easiest to handle it now.
+It is likely you will want the host interface the example here instead uses `docker0`.
+```bash
+export MY_IPA=$(ip -4 addr show docker0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+```
+
+You opened a branch for your issue.
+```bash
+export MY_BRANCH=issue_118
+```
+
+```bash
+echo "My IPA: ${MY_IPA}, WD: ${MY_WD}, ISSUE: ${MY_BRANCH}"
+```
+
+Install FTS using the candidate ZTI.
+The `--verbose` is optional.
+
+#### Use a Committed Branch from a Git Repository
+Notice that in the following command the `easy_install.sh` is taken from
+a working tree, while the branch is from the committed repository.
+
+```bash
+sudo bash ${MY_WD}/scripts/easy_install.sh -- \
+   --verbose --repo file://${MY_WD}/.git \
+   --branch ${MY_BRANCH:-main} \
+   --ip-addr ${MY_IPA} 
+```
+If you want to use Python packages from the https://test.pypi.org repository.
+```bash
+cat ${MY_WD}/scripts/easy_install.sh | \
+   sudo bash -s -- --verbose \
+      --repo file://${MY_WD}/.git \
+      --branch ${MY_BRANCH:-main} \
+      --ip-addr ${MY_IPA} \
+      --pypi https://test.pypi.org
+```
+
+### Configuration
+
+The official configuration instructions are
+[available in the user guide](https://freetakteam.github.io/FreeTAKServer-User-Docs/Installation/Operation/).
+Those instructions will not be duplicated here.
+
+## Running Installation Tests (smoke test)
+
+[Smoke testing](https://en.wikipedia.org/wiki/Smoke_testing_(software))
+is performed with the installation validation instructions.
+The official installation validation instructions are
+[available in the user guide](https://freetakteam.github.io/FreeTAKServer-User-Docs/Installation/Troubleshooting/InstallationCheck/).
+Those instructions will not be duplicated here.
+
+## Resetting the `distrobox`
+
+### Hard Reset
+The distrobox can be deleted and recreated.
+
+```shell
+distrobox rm fts
+```
+
+### Soft Reset
+
+The soft reset creates a new distrobox from a previous box.
+(You did make a snapshot, right?)
+```shell
+distrobox create --clone fts --name fts-test
+```

docs/ubuntu_rasppi_test.md → docs/ubuntu-test-rasppi.md

@@ -29,13 +29,28 @@ to get the `easy_install.sh` from the same repository and branch as the ZTI.
 
 The official GitHub is `FreeTAKTeam`,
 if you are working in a fork you will need to use that.
+
 ```bash
-export MY_IP=$(ip -4 addr show eth0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+export MY_IPA=$(ip -4 addr show eth0 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+export MY_GITHUB=babeloff
+export MY_BRANCH=issue_120
+echo "github: ${MY_GITHUB}, branch: ${MY_BRANCH}, addr: ${MY_IPA}"
+```
+
+The environment variables default values:
+```bash
+export MY_IPA=127.0.0.1
 export MY_GITHUB=FreeTAKTeam
-````
+export MY_BRANCH=main
+```
 
 ```bash
-wget -qO - https://raw.githubusercontent.com/${MY_GITHUB}/FreeTAKHub-Installation/main/scripts/easy_install.sh | sudo bash -s -- --verbose --repo https://github.com/${MY_GITHUB}/FreeTAKHub-Installation.git --branch main --ip-addr ${MY_IP}
+wget -qO - https://raw.githubusercontent.com/${MY_GITHUB:-FreeTAKTeam}/FreeTAKHub-Installation/${MY_BRANCH:-main}/scripts/easy_install.sh | \
+    sudo bash -s -- \
+      --verbose \
+      --repo https://github.com/${MY_GITHUB:-FreeTAKTeam}/FreeTAKHub-Installation.git \
+      --branch ${MY_BRANCH:-main} \
+      --ip-addr ${MY_IPA:-127.0.0.1}
 ```
 
 

roles/common/tasks/cleanup.yml

@@ -1,3 +1,5 @@
 ---
-- name: cleanup /tmp/*
-  shell: sudo rm -rf /tmp/*
+- name: cleanup temp files created by ansible
+  ansible.builtin.file:
+    path: /tmp/ansible*
+    state: absent

roles/common/vars/Ubuntu.yml

@@ -1,2 +1,6 @@
 ---
 unit_files_location: /etc/systemd/system
+
+# venv_python: "{{ ansible_python_interpreter }}"
+
+venv_python: "python"

roles/freetakserver/tasks/setup-Ubuntu.yml

@@ -17,6 +17,7 @@
 #    - "pip install /FreeTakServer"
 
 - name: "Install {{ fts_pip_package_name }}"
-  pip:
+  ansible.builtin.pip:
     name: "{{ fts_pip_package_name }}=={{ fts_version }}"
     virtualenv: "{{ fts_venv }}"
+    virtualenv_command: "{{ venv_python }} -m venv"

roles/freetakserver/tasks/uninstall-Ubuntu.yml

@@ -11,10 +11,11 @@
     state: absent
 
 - name: Uninstall
-  pip:
+  ansible.builtin.pip:
     name: "{{ fts_pip_package_name }}"
     state: absent
     virtualenv: "{{ fts_venv }}"
+    virtualenv_command: "{{ venv_python }} -m venv"
 
 - name: Remove files
   file:

roles/freetakserver_ui/tasks/setup-Ubuntu.yml

@@ -10,11 +10,13 @@
     name: "{{ fts_ui_apt_packages }}"
 
 - name: "Install pip packages"
-  pip:
+  ansible.builtin.pip:
     name: "{{ fts_ui_pip_packages }}"
     virtualenv: "{{ fts_venv }}"
+    virtualenv_command: "{{ venv_python }} -m venv"
 
 - name: "Install {{ fts_ui_pip_package_name }}"
-  pip:
+  ansible.builtin.pip:
     name: "{{ fts_ui_pip_package_name }}"
     virtualenv: "{{ fts_venv }}"
+    virtualenv_command: "{{ venv_python }} -m venv"

roles/freetakserver_ui/tasks/uninstall-Ubuntu.yml

@@ -11,7 +11,8 @@
     state: absent
 
 - name: Uninstall
-  pip:
+  ansible.builtin.pip:
     name: "{{ fts_ui_pip_package_name }}"
     state: absent
     virtualenv: "{{ fts_venv }}"
+    virtualenv_command: "{{ venv_python }} -m venv"

roles/nodered/defaults/main.yml

@@ -26,27 +26,23 @@ noderedserver_ipv4: 0.0.0.0
 noderedserver_port: 1880
 
 nodered_npm_packages:
-  - node-red@v2-maintenance
+  - node-red@v3.1.9
   - node-red-admin
-  - node-red-contrib-web-worldmap
+  - node-red-contrib-web-worldmap@5.0.3
+  - node-red-contrib-tak-registration@0.12.1
 
 nodered_nodes:
   - node-red-contrib-config
   - node-red-dashboard
   - node-red-contrib-credentials
 
+# Moved to their own repository : these are backups
 nodered_flows:
-  - salute.json
   - videochecker.json
-  - webmap.json
 
-nodered_post_flows_body: "{{ lookup('template', 'flows.json.j2') }}"
-
-nodered_post_flow_salute: "{{ lookup('template', 'salute.json.j2') }}"
+nodered_global_config_flow: "{{ lookup('template', 'global-config.json.j2') }}"
 
-nodered_post_flow_videochecker: "{{ lookup('template', 'videochecker.json.j2') }}"
-
-nodered_post_flow_webmap: "{{ lookup('template', 'webmap.json.j2') }}"
+nodered_post_flows_body: "{{ lookup('template', 'flows.json.j2') }}"
 
 nodered_service_name: nodered