[kolibri] fix variable naming format

Author: Ark74

roles/kolibri/defaults/main.yml

@@ -69,16 +69,16 @@ kolibri_nginx_template: "{{ 'kolibri-nginx-proot.conf.j2' if is_proot else 'koli
 kolibri_patch_path: "/opt/iiab/iiab/roles/proot_services/files/kolibri-00-prevent_ip_error_out_due_A15_restrictions.patch"
 
 # Custom repo data by OS
-os_repo:
-  true: # when is_debian
+kolibri_repo_dict:
+  True: # when is_debian
     repo: "https://learningequality.github.io/kolibri-installer-debian/"
     keyring: "/etc/apt/keyrings/learningequality-kolibri.asc"
     suite: "stable"
-  false: # when not is_debian
+  False: # when not is_debian
     repo: "http://ppa.launchpad.net/learningequality/kolibri/ubuntu/"
     keyring: "/etc/apt/keyrings/learningequality-kolibri.gpg"
     suite: "noble"
 
-repo_uris: "{{ os_repo[is_debian | string].repo }}"
-keyring_file: "{{ os_repo[is_debian | string].keyring }}"
-kolibri_suite: "{{ os_repo[is_debian | string].suite }}"
+kolibri_repo_uris: "{{ kolibri_repo_dict[is_debian | string].repo }}"
+kolibri_keyring_file: "{{ kolibri_repo_dict[is_debian | string].keyring }}"
+kolibri_suite: "{{ kolibri_repo_dict[is_debian | string].suite }}"

roles/kolibri/tasks/install.yml

@@ -71,21 +71,21 @@
 # https://github.com/learningequality/kolibri-installer-debian/pull/117
 
 # 2022-08-31: keyring /etc/apt/trusted.gpg DEPRECATED as detailed on #3343
-- name: "Download Kolibri's apt key to {{ keyring_file }}"
+- name: "Download Kolibri's apt key to {{ kolibri_keyring_file }}"
   shell: |
     gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys DC5BAA93F9E4AE4F0411F97C74F88ADB3194DD81
-    gpg --yes --output "{{ keyring_file }}" --export DC5BAA93F9E4AE4F0411F97C74F88ADB3194DD81
+    gpg --yes --output "{{ kolibri_keyring_file }}" --export DC5BAA93F9E4AE4F0411F97C74F88ADB3194DD81
   when: not is_debian
 
 - name: Remove stale apt .list
   file:
     path: /etc/apt/sources.list.d/ppa_launchpad_net_learningequality_kolibri_ubuntu.list
     state: absent
 
-- name: "Download Kolibri's apt key to {{ keyring_file }}"
+- name: "Download Kolibri's apt key to {{ kolibri_keyring_file }}"
   shell: |
     curl -fsSL https://learningequality.github.io/kolibri-installer-debian/pubkey.asc | \
-    tee "{{ keyring_file }}" > /dev/null
+    tee "{{ kolibri_keyring_file }}" > /dev/null
   when: is_debian
 
 # 2024-06-25: Strongly consider PPA "kolibri-proposed" in future...

roles/kolibri/templates/kolibri.sources.j2

@@ -1,5 +1,5 @@
 Types: deb
-URIs: {{ repo_uris }}
+URIs: {{ kolibri_repo_uris }}
 Suites: {{ kolibri_suite }}
 Components: main
-Signed-By: {{ keyring_file }}
+Signed-By: {{ kolibri_keyring_file }}