Retire thinlinc_build variable

The ThinLinc build number can be useful to know for testing and
debugging purposes, but is almost never useful to specify explicitly.
This commit removes the need for this parameter by globbing to determine
which package(s) to install, rather than refering to them by their full
name (which includes the build number).

This also means we can eliminate a whole configuration file worth of
variables used for mapping architectures, versions and package formats
to their respective filenames. As part of this, we also remove the
pkgdir variable and infer the package locations from the version number
instead.

This commit also introduces an assertion to make sure we're not trying
to install ThinLinc >4.14.0 on a 32-bit system, since support for this
architecture has been removed.

Author: aeneby

README.md

@@ -37,10 +37,9 @@ requirement for installing and using ThinLinc.
 
 ```yaml
 thinlinc_version: "4.14.0"
-thinlinc_build: "2408"
 ```
 
-ThinLinc version and build number.
+ThinLinc version number.
 
 ```yaml
 thinlinc_autoinstall_dependencies: "yes"

defaults/main.yml

@@ -4,7 +4,6 @@
 thinlinc_accept_eula: "no"
 
 thinlinc_version: "4.17.0"
-thinlinc_build: "3647"
 
 thinlinc_autoinstall_dependencies: "yes"
 

tasks/install-thinlinc-debian.yml

@@ -1,8 +1,44 @@
 ---
+- name: Locate 32-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*i386.deb"
+      - "thinlinc*all.deb"
+  when: ansible_architecture == 'i386'
+  register: _packages_32bit
+
+- name: Locate 64-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*amd64.deb"
+      - "thinlinc*all.deb"
+  when: ansible_architecture == 'x86_64'
+  register: _packages_64bit
+
 # The apt provider actually calls dpkg for local packages, which isn't
 # clever enough to handle our upgrades:
 # https://github.com/ansible/ansible/issues/77150
+#
+- name: Install 32-bit ThinLinc Software
+  command: >
+    /usr/bin/apt-get install -y
+    -o Dpkg::Options::="--no-debsig"
+    -o Dpkg::Options::="--force-confold"
+    {{ _packages_32bit.files | map(attribute='path') | join(' ') }}
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  when: _packages_32bit is not skipped
+  notify: run tl-setup
 
-- name: Install ThinLinc Software
-  command: "/usr/bin/apt install -y -o \"Dpkg::Options::=--no-debsig\" -o \"Dpkg::Options::=--force-confold\" {{ ' '.join(thinlinc_packages) }}"
+- name: Install 64-bit ThinLinc Software
+  command: >
+      /usr/bin/apt-get install -y
+      -o Dpkg::Options::="--no-debsig"
+      -o Dpkg::Options::="--force-confold"
+      {{ _packages_64bit.files | map(attribute='path') | join(' ') }}
+  environment:
+    DEBIAN_FRONTEND: noninteractive
+  when: _packages_64bit is not skipped
   notify: run tl-setup

tasks/install-thinlinc-rhel.yml

@@ -1,7 +1,34 @@
 ---
-- name: Install ThinLinc Software
+- name: Locate 32-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*i686.rpm"
+      - "thinlinc*noarch.rpm"
+  when: ansible_architecture == 'i386'
+  register: _packages_32bit
+
+- name: Locate 64-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*x86_64.rpm"
+      - "thinlinc*noarch.rpm"
+  when: ansible_architecture == 'x86_64'
+  register: _packages_64bit
+
+- name: Install 32-bit ThinLinc Software
   yum:
-    name: "{{ thinlinc_packages }}"
+    name: "{{ _packages_32bit.files | map(attribute='path') | list }}"
     state: present
     disable_gpg_check: true
+  when: _packages_32bit is not skipped
+  notify: run tl-setup
+
+- name: Install 64-bit ThinLinc Software
+  yum:
+    name: "{{ _packages_64bit.files | map(attribute='path') | list }}"
+    state: present
+    disable_gpg_check: true
+  when: _packages_64bit is not skipped
   notify: run tl-setup

tasks/install-thinlinc-suse.yml

@@ -1,7 +1,35 @@
 ---
-- name: Install ThinLinc Software
+---
+- name: Locate 32-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*i686.rpm"
+      - "thinlinc*noarch.rpm"
+  when: ansible_architecture == 'i386'
+  register: _packages_32bit
+
+- name: Locate 64-bit packages
+  find:
+    paths: "/root/tl-{{ thinlinc_version }}-server/packages"
+    patterns:
+      - "thinlinc*x86_64.rpm"
+      - "thinlinc*noarch.rpm"
+  when: ansible_architecture == 'x86_64'
+  register: _packages_64bit
+
+- name: Install 32-bit ThinLinc Software
+  zypper:
+    name: "{{ _packages_32bit.files | map(attribute='path') | list }}"
+    state: present
+    disable_gpg_check: true
+  when: _packages_32bit is not skipped
+  notify: run tl-setup
+
+- name: Install 64-bit ThinLinc Software
   zypper:
-    name: "{{ thinlinc_packages }}"
+    name: "{{ _packages_64bit.files | map(attribute='path') | list }}"
     state: present
     disable_gpg_check: true
+  when: _packages_64bit is not skipped
   notify: run tl-setup

tasks/main.yml

@@ -1,4 +1,10 @@
 ---
+- name: Ensure architecture is supported by current version
+  assert:
+    that: thinlinc_version is version('4.14.0', '<=')
+    msg: "32-bit architecture not supported by this version"
+  when: ansible_architecture == 'i386'
+
 - name: Installing pre-requisites
   package:
     name: unzip
@@ -14,21 +20,7 @@
       unarchive:
         src: "tl-{{ thinlinc_version }}-server.zip"
         dest: /root
-        creates: "{{ pkgdir }}"
-    - name: Checking if rpm platform
-      set_fact:
-        _tl_pkg_fmt: rpm
-      when: ansible_facts['os_family'] in ["RedHat", "Suse"]
-    - name: Checking if deb platform
-      set_fact:
-        _tl_pkg_fmt: deb
-      when: ansible_facts['os_family'] in ["Debian", "Ubuntu", "Linuxmint"]
-    - name: Checking which packages to install
-      set_fact:
-        thinlinc_packages:
-          "{{ _thinlinc_packages[ansible_architecture][_tl_pkg_fmt] if
-          ( thinlinc_version is version('4.14.0', '>') ) else
-          _old_thinlinc_packages[ansible_architecture][_tl_pkg_fmt] }}"
+        creates: "/root/tl-{{ thinlinc_version }}-server"
     - name: Run tasks for RHEL-like
       include_tasks: "install-thinlinc-rhel.yml"
       when: ansible_facts['os_family'] == "RedHat"