change searxng role variable structure

ansible/inventories/dev/group_vars/searxng.yml

@@ -29,20 +29,17 @@ users:
     opendoas_settings: "permit nopass ansible"
 
 
-searxng_homedir: /opt/searxng
-
-searxng_git_commit: 60be0f453e9e4a5fc48aeb4706e75af0a4047b36
-
 searxng_settings:
+  homedir: /opt/searxng
+  git_commit: 39c50dc013944a0a27b4354c23f406956ac45971
+  config:
     use_default_settings: true
-
     general:
       debug: false
       instance_name: "cuqmbr's SearXNG"
       donation_url: "https://cuqmbr.xyz/en/donate"
       contact_url: "https://cuqmbr.xyz/en/contact"
       enable_metrics: true
-
     search:
       safe_search: 0
       autocomplete: ""
@@ -50,7 +47,6 @@ searxng_settings:
         - html
         - csv
         - json
-
     server:
       base_url: "https://searxng.dev.cuqmbr.xyz"
       bind_address: "0.0.0.0"
@@ -73,7 +69,6 @@ searxng_settings:
         X-Robots-Tag: noindex, nofollow
         Referrer-Policy: no-referrer
       limiter: true
-
     redis:
       url: !vault |
         $ANSIBLE_VAULT;1.1;AES256
@@ -93,17 +88,14 @@ searxng_settings:
         37313163613733333835303363363932343264356662633262373661346463653936316162636332
         33633237656362363938653735313834376537333532343039653038326563633063323965633463
         37366662313263396637
-
     ui:
       static_use_hash: true
       results_on_new_tab: true
-
     categories_as_tabs:
       general:
       images:
       videos:
       files:
-
     plugins:
       searx.plugins.calculator.SXNGPlugin:
         active: true

ansible/roles/forgejo_runner/defaults/main.yml

@@ -1,5 +1,7 @@
 ---
 
+forgejo_runner_settings:
+
 forgejo_runner_default_settings:
   clean_binaries: false
   force_register: false

ansible/roles/searxng/.ansible-lint-ignore

@@ -0,0 +1 @@
+tasks/main.yml no-handler

ansible/roles/searxng/defaults/main.yml

@@ -1,22 +1,19 @@
 ---
 
-searxng_homedir: /opt/searxng
-
-searxng_git_commit: c185d076894ebbdb5db921c448c240d04915847b
-
 searxng_settings:
+
+searxng_default_settings:
+  homedir: /opt/searxng
+  git_commit: c185d076894ebbdb5db921c448c240d04915847b
+  config:
     # SearXNG settings
-
     use_default_settings: true
-
     general:
       debug: false
       instance_name: "cuqmbr's SearXNG"
-
     search:
       safe_search: 2
       autocomplete: 'duckduckgo'
-
     server:
       secret_key: "ultrasecretkey_change_me"
       limiter: false
@@ -24,19 +21,15 @@ searxng_settings:
       # public URL of the instance, to ensure correct inbound links.
       # Is overwritten by ${SEARXNG_URL}.
       base_url: http://example.com/location
-
     # redis:
       # URL to connect redis database. Is overwritten by ${SEARXNG_REDIS_URL}.
       # url: unix:///usr/local/searxng-redis/run/redis.sock?db=0
-
     ui:
       static_use_hash: true
-
     # preferences:
     #   lock:
     #     - autocomplete
     #     - method
-
     enabled_plugins:
       - 'Hash plugin'
       - 'Self Information'
@@ -44,6 +37,5 @@ searxng_settings:
       - 'Ahmia blacklist'
       # - 'Hostnames plugin'  # see 'hostnames' configuration below
       # - 'Open Access DOI rewrite'
-
     # plugins:
     #   - only_show_green_results

ansible/roles/searxng/molecule/default/molecule.yml

@@ -10,3 +10,5 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
     privileged: true
+    published_ports:
+      - 127.0.0.1:80:8888

ansible/roles/searxng/tasks/main.yml

@@ -1,5 +1,11 @@
 ---
 
+- name: Combine default and user settings, decrypt vault.
+  ansible.builtin.set_fact:
+    searxng_settings: "{{ searxng_default_settings |
+        ansible.builtin.combine(searxng_settings, recursive=true) }}"
+  no_log: true
+
 - name: Install dependencies.
   ansible.builtin.apt:
     name:
@@ -23,14 +29,14 @@
     password: !
     system: true
     create_home: true
-    home: "{{ searxng_homedir }}"
+    home: "{{ searxng_settings.homedir }}"
     shell: /usr/sbin/nologin
 
 - name: Set searxng_source and searxng_pyenv variable.
   ansible.builtin.set_fact:
-    searxng_source: "{{ searxng_homedir }}/src"
+    searxng_source: "{{ searxng_settings.homedir }}/src"
-    searxng_pyenv: "{{ searxng_homedir }}/pyenv"
+    searxng_pyenv: "{{ searxng_settings.homedir }}/pyenv"
-    searxng_compiled: "{{ searxng_homedir }}/compiled"
+    searxng_compiled: "{{ searxng_settings.homedir }}/compiled"
 
 - name: Clone searxng git repository.
   ansible.builtin.git:
@@ -38,7 +44,7 @@
     repo: https://github.com/searxng/searxng.git
     dest: "{{ searxng_source }}"
     depth: 1
-    version: "{{ searxng_git_commit }}"
+    version: "{{ searxng_settings.git_commit }}"
     force: true
     single_branch: true
   register: git_clone_result
@@ -54,13 +60,15 @@
       - pyyaml
     state: present
 
-- name: Remove searxng settings file.
+- name: Compile searxng.
+  when: git_clone_result.changed
+  block:
+    - name: Remove searxng settings file.
       ansible.builtin.file:
         path: /etc/searxng/settings.yml
         state: absent
-  when: git_clone_result.changed
 
-- name: Compile searxng.
+    - name: Compile searxng.
       ansible.builtin.pip:
         virtualenv: "{{ searxng_pyenv }}"
         requirements: "{{ searxng_source }}/requirements.txt"
@@ -68,13 +76,12 @@
                      -e {{ searxng_source }}"
         state: present
 
-- name: Remove old program files.
+    - name: Remove old program files.
       ansible.builtin.file:
         path: "{{ searxng_compiled }}"
         state: absent
-  changed_when: false
 
-- name: Install new program files.
+    - name: Install new program files.
       ansible.builtin.copy:
         remote_src: true
         src: "{{ searxng_source }}/"
@@ -82,7 +89,6 @@
         owner: searxng
         group: searxng
         mode: "0775"
-  changed_when: false
 
 - name: Create searxng settings directory.
   ansible.builtin.file:
@@ -92,12 +98,6 @@
     mode: "0775"
     path: /etc/searxng
 
-- name: Decrypt secrets in settings file.
-  ansible.builtin.set_fact:
-    searxng_settings: >-
-      {{ searxng_settings | combine(searxng_settings, recursive=true) }}
-  no_log: true
-
 - name: Install searxng settings file.
   ansible.builtin.template:
     src: settings.yml.j2

ansible/roles/searxng/templates/settings.yml.j2

@@ -1,4 +1,4 @@
 ---
 # Managed with Ansible
 
-{{ searxng_settings | ansible.builtin.to_nice_yaml(indent=2, width=80) }}
+{{ searxng_settings.config | ansible.builtin.to_nice_yaml(indent=2, width=80) }}