Merge pull request #38 from aeneby/simplify_version_spec

Simplify ThinLinc version specification

Author: samhed

CHANGELOG.md

@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  - Updated to 4.17.0
  - Added configuration for Web Access & Web Administration ports
  - Added configuration for Web Access login page
+ - Simplified/refactored package installation tasks
+
+### Removed
+
+ - thinlinc_server_bundle and thinlinc_build parameters
+ - vars/main.yaml configuration file (redundant)
 
 ## [1.10] - 2024-02-01
 

README.md

@@ -37,11 +37,9 @@ requirement for installing and using ThinLinc.
 
 ```yaml
 thinlinc_version: "4.14.0"
-thinlinc_build: "2408"
-thinlinc_server_bundle: "tl-4.14.0-server.zip"
 ```
 
-ThinLinc version, build number and server bundle names.
+ThinLinc version number.
 
 ```yaml
 thinlinc_autoinstall_dependencies: "yes"

defaults/main.yml

@@ -4,8 +4,6 @@
 thinlinc_accept_eula: "no"
 
 thinlinc_version: "4.17.0"
-thinlinc_build: "3647"
-thinlinc_server_bundle: "tl-4.17.0-server.zip"
 
 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
@@ -12,23 +18,9 @@
   block:
     - name: Unpacking ThinLinc server bundle
       unarchive:
-        src: "{{ thinlinc_server_bundle }}"
+        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"