Add CADT prerelease apt repo support and v2 config format

- Add cadt_apt_prerelease variable to toggle between stable and prerelease
  (cadt-test) apt repositories, with cleanup of the unused repo
- Add v2 config template and auto-detect config format based on version
- Add v1/v2 configuration defaults for dual-API support
- Fix cloudflare_proxy conditionals to use bool filter
- Add /worktrees/ to .gitignore

Author: TheLastCicada

.gitignore

@@ -4,3 +4,4 @@ playbook.yml
 hosts
 /vars/
 *.swp
+/worktrees/

cadt/defaults/main.yml

@@ -5,6 +5,7 @@ climate_apps_domains:
   - api2.example.com
 cadt_api_proxy: true
 cadt_api_version: latest
+cadt_apt_prerelease: false
 
 # Path to the CADT API in the proxy - include leading and trailing slash
 cadt_api_proxy_path: "/api/"
@@ -57,6 +58,42 @@ datalayer_http_location: "http://{{ climate_apps_domains | first }}:8575"
 # Chia network
 cadt_network: "mainnet"
 
+# New config format (>= 1.7.26)
+cadt_certificate_folder_path: null
+cadt_validate_organization_table_task_interval: 1800
+
+cadt_request_content_limits:
+  STAGING:
+    EDIT_DATA_LEN: 200
+  UNITS:
+    INCLUDE_COLUMNS_LEN: 200
+    MARKETPLACE_IDENTIFIERS_LEN: 200
+  PROJECTS:
+    INCLUDE_COLUMNS_LEN: 200
+    PROJECT_IDS_LEN: 200
+
+# V1 configuration - defaults inherit from the single-value variables above
+cadt_v1_enable: true
+cadt_v1_read_only: "{{ cadt_read_only }}"
+cadt_v1_api_key: "{{ cadt_api_key }}"
+cadt_v1_is_governance_body: "{{ cadt_is_governance_body }}"
+cadt_v1_governance_body_id: "{{ cadt_governance_body_id }}"
+cadt_v1_db_username: "{{ cadt_db_username }}"
+cadt_v1_db_password: "{{ cadt_db_password }}"
+cadt_v1_db_name: "{{ cadt_db_name }}"
+cadt_v1_db_host: "{{ cadt_db_host }}"
+
+# V2 configuration - disabled by default, must be explicitly configured
+cadt_v2_enable: false
+cadt_v2_read_only: false
+cadt_v2_api_key: null
+cadt_v2_is_governance_body: false
+cadt_v2_governance_body_id: null
+cadt_v2_db_username: null
+cadt_v2_db_password: null
+cadt_v2_db_name: null
+cadt_v2_db_host: null
+
 # Backups
 backup_base_dir: /home/{{ user }}/backup
 backup_dir: "{{ backup_base_dir }}/{{ cadt_port }}"

cadt/tasks/main.yml

@@ -9,10 +9,17 @@
         - 'vars'
   tags: cadt
 
+- name: Remove unused CADT repository
+  become: true
+  ansible.builtin.apt_repository:
+    repo: "deb [arch={{ cadt_repo_arch }} signed-by=/usr/share/keyrings/chia.gpg] https://repo.chia.net/{{ (cadt_apt_prerelease | bool) | ternary('cadt', 'cadt-test') }}/debian/ stable main"
+    state: absent
+  tags: cadt
+
 - name: Add CADT Repository
   become: true
   ansible.builtin.apt_repository:
-    repo: deb [arch={{ cadt_repo_arch }} signed-by=/usr/share/keyrings/chia.gpg] https://repo.chia.net/cadt/debian/ stable main
+    repo: "deb [arch={{ cadt_repo_arch }} signed-by=/usr/share/keyrings/chia.gpg] https://repo.chia.net/{{ (cadt_apt_prerelease | bool) | ternary('cadt-test', 'cadt') }}/debian/ stable main"
     update_cache: true
   tags: cadt
 
@@ -39,9 +46,16 @@
     state: restarted
   tags: cadt
 
+- name: Determine CADT config format
+  ansible.builtin.set_fact:
+    cadt_use_v2_config: >-
+      {{ cadt_api_version == 'latest' or
+         (cadt_api_version | regex_replace('[-~]rc\d+$', '') is version('1.7.26', '>=')) }}
+  tags: cadt
+
 - name: Add CADT config file
   ansible.builtin.template:
-    src: "config.yaml.j2"
+    src: "{{ (cadt_use_v2_config | bool) | ternary('config-v2.yaml.j2', 'config.yaml.j2') }}"
     dest: "{{ chia_root }}/cadt/v1/config.yaml"
     owner: "{{ user }}"
     group: "{{ user }}"

cadt/templates/config-v2.yaml.j2

@@ -0,0 +1,54 @@
+APP:
+  CW_PORT: {{ cadt_port }}
+  BIND_ADDRESS: {{ cadt_bind_address }}
+  DATALAYER_URL: https://localhost:{{ chia_data_layer_rpc_port }}
+  WALLET_URL: https://localhost:{{ chia_wallet_rpc_port }}
+  USE_SIMULATOR: false
+  CHIA_NETWORK: {{ cadt_network }}
+  USE_DEVELOPMENT_MODE: false
+  DEFAULT_FEE: {{ cadt_default_fee }}
+  DEFAULT_COIN_AMOUNT: {{ cadt_default_coin_amount }}
+  CERTIFICATE_FOLDER_PATH: {{ cadt_certificate_folder_path }}
+  DATALAYER_FILE_SERVER_URL: {{ datalayer_http_location }}
+  AUTO_SUBSCRIBE_FILESTORE: {{ cadt_auto_subscribe_filestore }}
+  AUTO_MIRROR_EXTERNAL_STORES: {{ cadt_auto_mirror_external_stores }}
+  LOG_LEVEL: {{ cadt_log_level }}
+  TASKS:
+    GOVERNANCE_SYNC_TASK_INTERVAL: {{ cadt_governance_sync_task_interval }}
+    ORGANIZATION_META_SYNC_TASK_INTERVAL: {{ cadt_organization_meta_sync_task_interval }}
+    PICKLIST_SYNC_TASK_INTERVAL: {{ cadt_picklist_sync_task_interval }}
+    MIRROR_CHECK_TASK_INTERVAL: {{ cadt_mirror_check_task_interval }}
+    VALIDATE_ORGANIZATION_TABLE_TASK_INTERVAL: {{ cadt_validate_organization_table_task_interval }}
+  REQUEST_CONTENT_LIMITS:
+    STAGING:
+      EDIT_DATA_LEN: {{ cadt_request_content_limits.STAGING.EDIT_DATA_LEN }}
+    UNITS:
+      INCLUDE_COLUMNS_LEN: {{ cadt_request_content_limits.UNITS.INCLUDE_COLUMNS_LEN }}
+      MARKETPLACE_IDENTIFIERS_LEN: {{ cadt_request_content_limits.UNITS.MARKETPLACE_IDENTIFIERS_LEN }}
+    PROJECTS:
+      INCLUDE_COLUMNS_LEN: {{ cadt_request_content_limits.PROJECTS.INCLUDE_COLUMNS_LEN }}
+      PROJECT_IDS_LEN: {{ cadt_request_content_limits.PROJECTS.PROJECT_IDS_LEN }}
+V1:
+  ENABLE: {{ cadt_v1_enable }}
+  READ_ONLY: {{ cadt_v1_read_only }}
+  CADT_API_KEY: {{ cadt_v1_api_key }}
+  IS_GOVERNANCE_BODY: {{ cadt_v1_is_governance_body }}
+  GOVERNANCE:
+    GOVERNANCE_BODY_ID: {{ cadt_v1_governance_body_id }}
+  MIRROR_DB:
+    DB_USERNAME: {{ cadt_v1_db_username }}
+    DB_PASSWORD: {{ cadt_v1_db_password }}
+    DB_NAME: {{ cadt_v1_db_name }}
+    DB_HOST: {{ cadt_v1_db_host }}
+V2:
+  ENABLE: {{ cadt_v2_enable }}
+  READ_ONLY: {{ cadt_v2_read_only }}
+  CADT_API_KEY: {{ cadt_v2_api_key }}
+  IS_GOVERNANCE_BODY: {{ cadt_v2_is_governance_body }}
+  GOVERNANCE:
+    GOVERNANCE_BODY_ID: {{ cadt_v2_governance_body_id }}
+  MIRROR_DB:
+    DB_USERNAME: {{ cadt_v2_db_username }}
+    DB_PASSWORD: {{ cadt_v2_db_password }}
+    DB_NAME: {{ cadt_v2_db_name }}
+    DB_HOST: {{ cadt_v2_db_host }}

climate-nginx-base/tasks/main.yml

@@ -68,15 +68,15 @@
     src: cloudflare-update-ip-ranges.sh
     dest: /usr/local/bin/cloudflare-update-ip-ranges.sh
     mode: '0755'
-  when: cloudflare_proxy
+  when: cloudflare_proxy | bool
   tags: climate-nginx-base
 
 # Run Cloudflare IP address retrieval script if proxying through cloudflare
 - name: Run Cloudflare IP address retrieval script
   become: true
   ansible.builtin.shell:
     cmd: /usr/local/bin/cloudflare-update-ip-ranges.sh
-  when: cloudflare_proxy
+  when: cloudflare_proxy | bool
   tags: climate-nginx-base
 
 # If proxying through cloudflare, set crontab to run the cloudflare-update-ip-ranges.sh script once a week
@@ -90,7 +90,7 @@
     day: "*"
     month: "*"
     weekday: "1"
-  when: cloudflare_proxy
+  when: cloudflare_proxy | bool
   tags: climate-nginx-base
 
 # Remove blocklist file if nginx_blocklist is empty