Merge pull request #26 from Thulium-Drake/master

Multiple fixes

Author: CendioMartin

.gitignore

@@ -0,0 +1,3 @@
+molecule/default/tests/__pycache__/
+*.swp
+*.pyc

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+- Rewrite to fix style issues, fix some tasks to be a bit more 'ansible-y'
+- Fixed file permissions warning
+- Made role compatible with 'new' ansible_facts[...] notation of facts
+- Made template correctly translate true/false to yes/no
+
 ### Changed
 
 ## [1.8] - 2022-02-07

handlers/main.yml

@@ -1,16 +1,24 @@
 ---
 # handlers file for thinlinc-server
 - name: restart vsmagent
-  service: name=vsmagent state=restarted
+  service:
+    name: vsmagent
+    state: restarted
 
 - name: restart vsmserver
-  service: name=vsmserver state=restarted
+  service:
+    name: vsmserver
+    state: restarted
 
 - name: restart tlwebadm
-  service: name=tlwebadm state=restarted
+  service:
+    name: tlwebadm
+    state: restarted
 
 - name: restart tlwebaccess
-  service: name=tlwebaccess state=restarted
+  service:
+    name: tlwebaccess
+    state: restarted
 
 - name: run tl-setup
   command: /opt/thinlinc/sbin/tl-setup -a "/root/thinlinc-setup.answers"

meta/main.yml

@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: Karl Mikaelsson
-  description: your description
+  description: Thinlinc Server
   company: Cendio AB
   license: GPLv3
 
@@ -13,6 +13,7 @@ galaxy_info:
     - name: EL
       versions:
         - 7
+        - 8
     - name: SLES
       versions:
         - 12

tasks/check_installed_deb.yml

@@ -6,7 +6,6 @@
   register: etc_pam_sshd
 
 - block:
-
     - name: Check /usr/etc/pam.d/sshd
       stat:
         path: /usr/etc/pam.d/sshd
@@ -16,6 +15,9 @@
       copy:
         src: /usr/etc/pam.d/sshd
         dest: /etc/pam.d/sshd
+        owner: root
+        group: root
+        mode: '0644'
         remote_src: true
       when: usr_etc_pam_sshd.stat.exists == true
 

tasks/check_installed_rpm.yml

@@ -1,4 +1,7 @@
 ---
 - name: Install ThinLinc Software
-  yum: name="{{ thinlinc_packages }}" state=present  disable_gpg_check=true
+  yum:
+    name: "{{ thinlinc_packages }}"
+    state: present
+    disable_gpg_check: true
   notify: run tl-setup

tasks/copy_usr_etc_pam_sshd.yml

@@ -1,4 +1,7 @@
 ---
 - name: Install ThinLinc Software
-  zypper: name="{{ thinlinc_packages }}" state=present disable_gpg_check=True
+  zypper:
+    name: "{{ thinlinc_packages }}"
+    state: present
+    disable_gpg_check: true
   notify: run tl-setup

tasks/install-thinlinc-rhel.yml

@@ -1,73 +1,81 @@
 ---
-
 - name: Installing pre-requisites
   package:
     name: unzip
     state: present
+    update_cache: true
 
-- name: Checking for installed ThinLinc packages
-  block:
-    - include_tasks: "check_installed_rpm.yml"
-      when: ansible_os_family in ["RedHat", "Suse"]
-    - include_tasks: "check_installed_deb.yml"
-      when: ansible_os_family in ["Debian", "Ubuntu", "Linuxmint"]
+- name: Collect installed packages
+  package_facts:
 
 - name: Installing ThinLinc packages
   block:
     - name: Unpacking ThinLinc server bundle
       unarchive:
         src: "{{ thinlinc_server_bundle }}"
         dest: /root
-    - include_vars: "packages-rpm-{{ ansible_architecture }}.yml"
-      when: ansible_os_family in ["RedHat", "Suse"]
-    - include_vars: "packages-deb-{{ ansible_architecture }}.yml"
-      when: ansible_os_family in ["Debian", "Ubuntu", "Linuxmint"]
-    - include_tasks: "install-thinlinc-rhel.yml"
-      when: ansible_os_family == "RedHat"
-    - include_tasks: "install-thinlinc-suse.yml"
-      when: ansible_os_family == "Suse"
-    - include_tasks: "install-thinlinc-debian.yml"
-      when: ansible_os_family in ["Debian", "Ubuntu", "Linuxmint"]
-  when: thinlinc_packages_installed.rc == 1
+        creates: "{{ pkgdir }}"
+    - name: Load vars for {{ ansible_facts['architecture'] }} RPMs
+      include_vars: "packages-rpm-{{ ansible_facts['architecture'] }}.yml"
+      when: ansible_facts['os_family'] in ["RedHat", "Suse"]
+    - name: Load vars for {{ ansible_facts['architecture'] }} DEBs
+      include_vars: "packages-deb-{{ ansible_facts['architecture'] }}.yml"
+      when: ansible_facts['os_family'] in ["Debian", "Ubuntu", "Linuxmint"]
+    - name: Run tasks for RHEL-like
+      include_tasks: "install-thinlinc-rhel.yml"
+      when: ansible_facts['os_family'] == "RedHat"
+    - name: Run tasks for SUSE-like
+      include_tasks: "install-thinlinc-suse.yml"
+      when: ansible_facts['os_family'] == "Suse"
+    - name: Run tasks for Debian-like
+      include_tasks: "install-thinlinc-debian.yml"
+      when: ansible_facts['os_family'] in ["Debian", "Ubuntu", "Linuxmint"]
+  when: >
+    ansible_facts['packages']['thinlinc-vsm'][0]['version'] is not defined or
+    ansible_facts['packages']['thinlinc-vsm'][0]['version'] != thinlinc_version
 
 # Workaround for OpenSUSE Tumbleweed usr merge
 # See https://www.cendio.com/bugzilla/show_bug.cgi?id=7829
 - name: Copy /usr/etc/pam.d/sshd
   include_tasks: "copy_usr_etc_pam_sshd.yml"
+  when: ansible_facts['os_family'] == "Suse"
 
 - name: Copy in tlsetup.answers
   template:
     src: thinlinc-setup.answers.j2
     dest: /root/thinlinc-setup.answers
+    owner: root
+    group: root
+    mode: '0644'
   notify: run tl-setup
 
-# Force tl-setup to run here, if required
-- meta: flush_handlers
+- name: Force tl-setup to run if required
+  meta: flush_handlers
 
 - name: Configure /vsmagent/agent_hostname
   tlconfig:
     param: /vsmagent/agent_hostname
-    value: "{{ thinlinc_agent_hostname or ansible_fqdn }}"
+    value: "{{ thinlinc_agent_hostname | default(ansible_facts['fqdn']) }}"
   notify: restart vsmagent
   when: "'thinlinc_agents' in group_names"
 
 - name: Configure /vsmagent/master_hostname
   tlconfig:
     param: /vsmagent/master_hostname
-    value: "{{ groups['thinlinc_masters'][0] or 'localhost' }}"
+    value: "{{ groups['thinlinc_masters'][0] | default('localhost') }}"
   notify: restart vsmagent
   when: "'thinlinc_agents' in group_names"
 
 - name: Configure /vsmagent/allowed_clients
   tlconfig:
     param: /vsmagent/allowed_clients
-    value: "{{ ' '.join(groups['thinlinc_masters']) or 'localhost' }}"
+    value: "{{ groups['thinlinc_masters'] | default(['localhost']) | join(' ') }}"
   notify: restart vsmagent
   when: "'thinlinc_agents' in group_names"
 
 - name: Configure list of agent servers
   tlconfig:
     param: /vsmserver/subclusters/Default/agents
-    value: "{{ ' '.join(groups['thinlinc_agents']) or 'localhost' }}"
+    value: "{{ groups['thinlinc_agents'] | default(['localhost']) | join(' ') }}"
   notify: restart vsmserver
   when: "'thinlinc_masters' in group_names"