From bb95f050a1e04fbed018d144a483c180eab61c22 Mon Sep 17 00:00:00 2001 From: Chewbaccalakis Date: Sun, 25 Oct 2026 21:23:36 +0000 Subject: [PATCH] changed how supernote works, already deprecated though and will remove in next commit --- ansible/plays/machine_setup/supernote.yml | 17 ++++++++++++----- .../templates/grist-docker-compose.yml | 12 ------------ 2 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 ansible/plays/machine_setup/templates/grist-docker-compose.yml diff --git a/ansible/plays/machine_setup/supernote.yml b/ansible/plays/machine_setup/supernote.yml index 678230c..4f9254d 100644 --- a/ansible/plays/machine_setup/supernote.yml +++ b/ansible/plays/machine_setup/supernote.yml @@ -25,6 +25,9 @@ - name: Deploy Supernote Private Cloud vars: supernote_dir: /opt/supernote + # Branch of AtlasHorizon/compose to deploy from; override with + # `-e compose_branch=main` to test unreleased changes. + compose_branch: stable block: - name: Create data persistence directories ansible.builtin.file: @@ -44,8 +47,9 @@ # Downloaded fresh each run so upstream schema changes apply on # reruns, per Supernote's own upgrade instructions. docker-compose.yml - # is vendored instead (see templates/supernote-docker-compose.yml) - - # the upstream file is missing the initdb mounts this playbook needs. + # comes from AtlasHorizon/compose instead (see supernote/README.md + # there) - the upstream file is missing the initdb mounts this + # playbook needs. - name: Download Supernote database init script ansible.builtin.get_url: url: https://supernote-private-cloud.supernote.com/cloud/supernotedb.sql @@ -53,11 +57,14 @@ mode: "0644" force: yes - - name: Deploy docker-compose.yml - ansible.builtin.copy: - src: templates/supernote-docker-compose.yml + # force: true so changes in the compose repo are picked up on reruns; + # it only reports changed when the content differs. + - name: Download docker-compose.yml + ansible.builtin.get_url: + url: "https://git.atlashorizon.net/AtlasHorizon/compose/raw/branch/{{ compose_branch }}/supernote/docker-compose.yml" dest: "{{ supernote_dir }}/docker-compose.yml" mode: "0644" + force: true # Pulled from Infisical, not generated/persisted to disk. Run this # playbook as `infisical run -- ansible-playbook -i inventory ...` diff --git a/ansible/plays/machine_setup/templates/grist-docker-compose.yml b/ansible/plays/machine_setup/templates/grist-docker-compose.yml deleted file mode 100644 index 49fe6e2..0000000 --- a/ansible/plays/machine_setup/templates/grist-docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Managed by Ansible (grist.yml). Vendored here since grist-core has no -# docker-compose.yml at its repo root (see docker-compose-examples/ upstream). -services: - grist: - image: gristlabs/grist:latest - restart: unless-stopped - ports: - - "8484:8484" - volumes: - - ./persist:/persist - env_file: - - .env