From f1604a8ee04a45729254c5f0039a48d2c1fd8d63 Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Wed, 29 Oct 2025 23:36:47 +0100 Subject: [PATCH 1/4] fix(ui): use correct key for software settings --- ui/schemas/softwares.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/schemas/softwares.js b/ui/schemas/softwares.js index 2db02dce..9e5ffbdf 100644 --- a/ui/schemas/softwares.js +++ b/ui/schemas/softwares.js @@ -71,7 +71,7 @@ NEWSCHEMA('Softwares', function (schema) { .promise($); const settings = await DATA.read('nosql/variables') - .where('key', 'catalogs') + .where('key', 'softwares') .where('type', 'settings') .promise($); From 05e308730d2ed4ac105692b03e2bc111f4399996 Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Wed, 29 Oct 2025 23:37:10 +0100 Subject: [PATCH 2/4] feat(config): add GitHub token env and SSH volume to nomad job --- .../saas/roles/simplestack_ansible/templates/nomad.hcl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/playbooks/saas/roles/simplestack_ansible/templates/nomad.hcl b/ansible/playbooks/saas/roles/simplestack_ansible/templates/nomad.hcl index d0f81d66..113dc13f 100644 --- a/ansible/playbooks/saas/roles/simplestack_ansible/templates/nomad.hcl +++ b/ansible/playbooks/saas/roles/simplestack_ansible/templates/nomad.hcl @@ -42,11 +42,15 @@ job "{{ domain }}" { SIMPLE_STACK_UI_USER = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='user', missing='error') }}" SIMPLE_STACK_UI_PASSWORD = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='password', missing='error') }}" SIMPLE_STACK_UI_URL = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='url', missing='error') }}" + GITHUB_API_TOKEN = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='github_api_token', missing='error') }}" } config { image = "ghcr.io/wiseflat/simple-stack-ansible:v{{ softwares.simplestack_ui.version }}" ports = ["http"] + volumes = [ + "/root/.ssh:/root/.ssh:ro" + ] work_dir = "/ansible" command = "ansible-rulebook" args = ["-r", "rulebook.yml", "-i", "inventory.py", "-vvv"] From 23c2f050fe9dabc56a2e6827fc659fc3690f569f Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Wed, 29 Oct 2025 23:37:28 +0100 Subject: [PATCH 3/4] fix(config): parse software lookup as JSON --- ansible/playbooks/saas/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/saas/main.yml b/ansible/playbooks/saas/main.yml index 07729907..ea194516 100644 --- a/ansible/playbooks/saas/main.yml +++ b/ansible/playbooks/saas/main.yml @@ -27,7 +27,7 @@ - name: Get software variables ansible.builtin.set_fact: - software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') }}" + software: "{{ lookup('simple-stack-ui', type='software', key=domain, subkey='', missing='warn') | from_json }}" - name: Debug software ansible.builtin.debug: From 2ee6b7a9750fb4206fbb423bb192dc2615564b0d Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Wed, 29 Oct 2025 23:38:43 +0100 Subject: [PATCH 4/4] feat(ansible): Add vim package to docker image --- ansible/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/Dockerfile b/ansible/Dockerfile index d7e61f93..44467a34 100644 --- a/ansible/Dockerfile +++ b/ansible/Dockerfile @@ -4,6 +4,7 @@ ARG JAVA_VERSION=21 RUN apt-get update && apt-get install --no-install-recommends -y \ bash \ + vim \ git \ curl \ unzip \