From 4dd159e4c53b7f2949da981e5ecc15d0bd091735 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 20:42:06 -0400
Subject: [PATCH 01/21] Update inventory

Updated client version to 7.6.21
Added FAH team number
standardized comments and formatting
---
 inventory | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/inventory b/inventory
index 7a4c1ec..6118f21 100644
--- a/inventory
+++ b/inventory
@@ -2,7 +2,7 @@
 #your client1
 #your client2
 
-#Notes
+# Notes
 # for updating services on ansible server:
 #localhost ansible_connection=local  
 # If you get complaints about python version
@@ -19,19 +19,20 @@
 # add the list of hosts that you want to install the Folding-at-Home viewer on, here:
 #coffee ansible_connection=local  ansible_python_interpreter=/usr/bin/python3
 [clients:vars]
-fahclient_ver= 7.6.10
+fahclient_ver= 7.6.21
 
 [controllers:vars]
-fahcontrol_ver= 7.6.10
+fahcontrol_ver= 7.6.21
 
 [viewers:vars]
-fahviewer_ver= 7.6.10
+fahviewer_ver= 7.6.21
 
 [all:vars]
-chost='IP of Control Node'
-cpass='control-node-password'
+chost='(IP of Control Node)'
+cpass='(control-node-password)'
 username='(Yourname @ folding@home)'
-passkey='(redacted passkey from folding@home'
+team=''
+passkey='(redacted passkey from folding@home)'
 power=full
 gpu=false
 smp=true
@@ -45,4 +46,3 @@ ansible_connection=ssh
 ansible_become=yes
 ansible_become_method=sudo
 ansible_become_user=root
-

From e8b0a1881170541a535da4ea81342bd53eb64ce1 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 20:51:28 -0400
Subject: [PATCH 02/21] Update main.yml

yamllint
ugly hack for jammy release
---
 main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.yml b/main.yml
index e45a914..9e35f18 100644
--- a/main.yml
+++ b/main.yml
@@ -10,7 +10,7 @@
         update_cache: true
       when:
         (ansible_distribution == 'Debian') or
-        (ansible_distribution == 'Ubuntu')
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release != 'jammy')
 
     - name: Populate service facts
       service_facts:
@@ -23,7 +23,7 @@
 
     - name: Include GPU tasks if enabled
       include_tasks: gpu.yaml
-#      static: no
+      # static: no
       when: (gpu | bool)
 
     - import_role:

From 964a6eef26785a705cea79985dc28da548226ef3 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 20:52:18 -0400
Subject: [PATCH 03/21] Update gpu.yaml

yamllint
---
 gpu.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gpu.yaml b/gpu.yaml
index 0f78483..d6d8e4f 100644
--- a/gpu.yaml
+++ b/gpu.yaml
@@ -45,4 +45,3 @@
   when:
     (gpu | bool) and
     (gpu_type == 'radeon')
-

From 82dd6a6994d466b75db3564d799790543a224f56 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 20:55:43 -0400
Subject: [PATCH 04/21] Update dependencies.yaml

yamllint

From 98287112774ed06e737833fd907286ea94d0937a Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 20:59:24 -0400
Subject: [PATCH 05/21] Update main.yaml

yamllint
---
 roles/opencl-driver-install/tasks/main.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/opencl-driver-install/tasks/main.yaml b/roles/opencl-driver-install/tasks/main.yaml
index 0e6a5dd..6cc665c 100644
--- a/roles/opencl-driver-install/tasks/main.yaml
+++ b/roles/opencl-driver-install/tasks/main.yaml
@@ -26,8 +26,8 @@
     state: present
   when: "ansible_distribution == 'RedHat'"
 
-#- name: install OpenCL drivers
-#  package:
-#    name: opencl
-#    state: present
-#  when: "ansible_distribution == 'RedHat'"
+# - name: install OpenCL drivers
+#   package:
+#     name: opencl
+#     state: present
+#   when: "ansible_distribution == 'RedHat'"

From de2efa71fd3e52eeca23ebfceaad6136c4a37d45 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:02:04 -0400
Subject: [PATCH 06/21] Update main.yaml

yamllint
---
 roles/fahviewer/tasks/main.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/fahviewer/tasks/main.yaml b/roles/fahviewer/tasks/main.yaml
index 02fe6ca..8673ea7 100644
--- a/roles/fahviewer/tasks/main.yaml
+++ b/roles/fahviewer/tasks/main.yaml
@@ -27,4 +27,3 @@
   when:
     ('fahviewer' not in ansible_facts.packages) and
     (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')
-

From b9004a1273765a2467d6455a9444967b329fabb6 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:08:32 -0400
Subject: [PATCH 07/21] Update main.yaml

added 7.6.21
---
 roles/fahviewer/vars/main.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/fahviewer/vars/main.yaml b/roles/fahviewer/vars/main.yaml
index 425ab30..09d661e 100644
--- a/roles/fahviewer/vars/main.yaml
+++ b/roles/fahviewer/vars/main.yaml
@@ -28,7 +28,8 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.11_amd64.deb'
     '7.6.12': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.12_amd64.deb'
     '7.6.13': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.13_amd64.deb'
-    'latestbeta':   '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest.deb'
+    '7.6.21': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.21_amd64.deb'
+    'latestbeta': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest.deb'
     'latestpublic': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/latest.deb'
 
   Ubuntu:
@@ -52,10 +53,10 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.11_amd64.deb'
     '7.6.12': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.12_amd64.deb'
     '7.6.13': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.13_amd64.deb'
-    'latestbeta':   '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest.deb'
+    '7.6.21': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/{{ product }}_7.6.21_amd64.deb'
+    'latestbeta': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest.deb'
     'latestpublic': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/latest.deb'
 
-
   Fedora:
     '7.4.15': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.15-1.x86_64.rpm'
     '7.4.16': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.16-1.x86_64.rpm'
@@ -77,12 +78,10 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.x86_64.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.x86_64.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.x86_64.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.x86_64.rpm'
     'latestbeta': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
     'latestpublic': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
 
-
-
-
   RedHat:
     '7.4.15': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.15-1.x86_64.rpm'
     '7.4.16': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.16-1.x86_64.rpm'
@@ -104,10 +103,10 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.x86_64.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.x86_64.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.x86_64.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.x86_64.rpm'
     'latestbeta': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
     'latestpublic': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
 
-
   CentOS:
     '7.4.15': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.15-1.x86_64.rpm'
     '7.4.16': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.5/{{ product }}-7.4.16-1.x86_64.rpm'
@@ -129,6 +128,7 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.x86_64.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.x86_64.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.x86_64.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.x86_64.rpm'
     'latestbeta': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
     'latestpublic': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
 
@@ -153,6 +153,6 @@ fah_viewer_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.x86_64.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.x86_64.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.x86_64.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.x86_64.rpm'
     'latestbeta': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
     'latestpublic': '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.rpm'
-

From 72b55ef7c49213b7ae7c4aadea77132a0659f183 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:11:43 -0400
Subject: [PATCH 08/21] Update main.yaml

yamllint
---
 roles/fahcontroller/tasks/main.yaml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/roles/fahcontroller/tasks/main.yaml b/roles/fahcontroller/tasks/main.yaml
index 30e0d36..4902cf1 100644
--- a/roles/fahcontroller/tasks/main.yaml
+++ b/roles/fahcontroller/tasks/main.yaml
@@ -16,14 +16,14 @@
 - name: install FaH dependencies (RPM)
   package:
     name:
-    - python2
-    - pygtk2
+      - python2
+      - pygtk2
     state: latest
 
 - name: install FaH packages (RPM)
   shell: "rpm -ivh --nodeps --noscripts /tmp/{{ item | regex_replace( '^http.*/', '' ) }}"
-  args: 
-    warn: no
+  args:
+    warn: false
   with_items: "{{ fah_control_pkgs[ ansible_distribution ][ fahcontrol_ver ] }}"
   when:
     ('fahcontrol' not in ansible_facts.packages) and
@@ -46,4 +46,3 @@
   when:
     ('fahcontrol' not in ansible_facts.packages) and
     (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')
-

From 55de0a2ba9a9a1afb8301cb8045bd63368e7c446 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:17:04 -0400
Subject: [PATCH 09/21] Update main.yaml

---
 roles/fahcontroller/vars/main.yaml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/roles/fahcontroller/vars/main.yaml b/roles/fahcontroller/vars/main.yaml
index 43e62e7..28b28dc 100644
--- a/roles/fahcontroller/vars/main.yaml
+++ b/roles/fahcontroller/vars/main.yaml
@@ -18,10 +18,14 @@ fah_control_pkgs:
     '7.6.8': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.8-1_all.deb'
     '7.6.9': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.9-1_all.deb'
     '7.6.10': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.10-1_all.deb'
+    '7.6.11': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.11-1_all.deb'
+    '7.6.12': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.12-1_all.deb'
+    '7.6.13': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.13-1_all.deb'
+    '7.6.21': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.21-1_all.deb'
     'latestbeta': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/latest_all.deb'
     'latestpublic': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest_all.deb'
 
-  Ubuntu: 
+  Ubuntu:
     '7.5.0': '{{ url }}/{{ public }}/debian-stable-64bit/v7.5/{{ product }}_7.5.0-1_all.deb'
     '7.5.1': '{{ url }}/{{ public }}/debian-stable-64bit/v7.5/{{ product }}_7.5.1-1_all.deb'
     '7.6.0': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.0-1_all.deb'
@@ -35,6 +39,10 @@ fah_control_pkgs:
     '7.6.8': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.8-1_all.deb'
     '7.6.9': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.9-1_all.deb'
     '7.6.10': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.10-1_all.deb'
+    '7.6.11': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.11-1_all.deb'
+    '7.6.12': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.12-1_all.deb'
+    '7.6.13': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.13-1_all.deb'
+    '7.6.21': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/{{ product }}_7.6.21-1_all.deb'
     'latestbeta': '{{ url }}/{{ beta }}/debian-stable-64bit/v7.6/latest_all.deb'
     'latestpublic': '{{ url }}/{{ public }}/debian-stable-64bit/v7.6/latest_all.deb'
 
@@ -83,6 +91,7 @@ fah_control_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.noarch.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.noarch.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.noarch.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.noarch.rpm'
     'latestpublic': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
     'latestbeta':  '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
 
@@ -107,6 +116,7 @@ fah_control_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.noarch.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.noarch.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.noarch.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.noarch.rpm'
     'latestpublic': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
     'latestbeta':  '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
 
@@ -131,6 +141,6 @@ fah_control_pkgs:
     '7.6.11': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.11-1.noarch.rpm'
     '7.6.12': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.12-1.noarch.rpm'
     '7.6.13': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.13-1.noarch.rpm'
+    '7.6.21': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/{{ product }}-7.6.21-1.noarch.rpm'
     'latestpublic': '{{ url }}/{{ public }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
     'latestbeta':  '{{ url }}/{{ beta }}/centos-6.7-64bit/v7.6/latest.noarch.rpm'
-

From e865699a273c0ad34348c5321403c63fed9ee665 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:18:43 -0400
Subject: [PATCH 10/21] Update main.yaml

yamllint
---
 roles/fahclient/defaults/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/fahclient/defaults/main.yaml b/roles/fahclient/defaults/main.yaml
index b71e330..6ac7743 100644
--- a/roles/fahclient/defaults/main.yaml
+++ b/roles/fahclient/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
- 
+
 # F@H Client version
 # Supported Versions:
 #   - 7.5.1

From d594b27d0946aae54b755369fd9ad1da82109df6 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:24:54 -0400
Subject: [PATCH 11/21] Update main.yaml

yamllint
---
 roles/fahclient/vars/main.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/roles/fahclient/vars/main.yaml b/roles/fahclient/vars/main.yaml
index 74d1f99..3ba0730 100644
--- a/roles/fahclient/vars/main.yaml
+++ b/roles/fahclient/vars/main.yaml
@@ -1,5 +1,5 @@
 ---
- 
+
 fah_client_pkgs:
   Debian:
     '7.4.16': 'https://download.foldingathome.org/releases/beta/release/fahclient/debian-stable-64bit/v7.4/fahclient_7.4.16_amd64.deb'
@@ -21,10 +21,10 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.11_amd64.deb'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.12_amd64.deb'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.13_amd64.deb'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.21_amd64.deb'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/debian-stable-64bit/v7.6/latest.deb'
     'latestpublic': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/latest.deb'
 
-
   Ubuntu:
     '7.4.16': 'https://download.foldingathome.org/releases/beta/release/fahclient/debian-stable-64bit/v7.4/fahclient_7.4.16_amd64.deb'
     '7.4.17': 'https://download.foldingathome.org/releases/beta/release/fahclient/debian-stable-64bit/v7.4/fahclient_7.4.17_amd64.deb'
@@ -45,6 +45,7 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.11_amd64.deb'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.12_amd64.deb'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.13_amd64.deb'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/fahclient_7.6.21_amd64.deb'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/debian-stable-64bit/v7.6/latest.deb'
     'latestpublic': 'https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v7.6/latest.deb'
 
@@ -68,6 +69,7 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.11-1.x86_64.rpm'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.12-1.x86_64.rpm'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.13-1.x86_64.rpm'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.21-1.x86_64.rpm'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
     'latestprod': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
 
@@ -91,6 +93,7 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.11-1.x86_64.rpm'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.12-1.x86_64.rpm'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.13-1.x86_64.rpm'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.21-1.x86_64.rpm'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
     'latestprod': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
 
@@ -114,6 +117,7 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.11-1.x86_64.rpm'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.12-1.x86_64.rpm'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.13-1.x86_64.rpm'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.21-1.x86_64.rpm'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
     'latestprod': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
 
@@ -137,6 +141,6 @@ fah_client_pkgs:
     '7.6.11': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.11-1.x86_64.rpm'
     '7.6.12': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.12-1.x86_64.rpm'
     '7.6.13': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.13-1.x86_64.rpm'
+    '7.6.21': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/fahclient-7.6.21-1.x86_64.rpm'
     'latestbeta': 'https://download.foldingathome.org/releases/beta/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
     'latestprod': 'https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v7.6/latest.rpm'
-

From 1b7261b408f52f17c61c9d8c98a9f5bd7b2c0b11 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:27:06 -0400
Subject: [PATCH 12/21] Update dependencies.yaml

yamllint
---
 roles/docker/tasks/dependencies.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/docker/tasks/dependencies.yaml b/roles/docker/tasks/dependencies.yaml
index 7e7ec82..175149b 100644
--- a/roles/docker/tasks/dependencies.yaml
+++ b/roles/docker/tasks/dependencies.yaml
@@ -37,13 +37,13 @@
     state: present
 
 # Docker Compose is not needed but can be added
-#- name: Download and install docker-compose
-#  get_url:
-#    url: https://github.com/docker/compose/releases/download/{{ docker_compose }}/docker-compose-Linux-x86_64
-#    dest: /usr/local/bin/docker-compose
-#    owner: root
-#    group: root
-#    mode: 0755
+# - name: Download and install docker-compose
+#   get_url:
+#     url: https://github.com/docker/compose/releases/download/{{ docker_compose }}/docker-compose-Linux-x86_64
+#     dest: /usr/local/bin/docker-compose
+#     owner: root
+#     group: root
+#     mode: 0755
 
 # Set ip forwarding on in /proc and in the sysctl file and reload if necessary
 - sysctl:

From 432b5ce891fd8a476ffbd7dae5db836b629a6219 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 3 May 2023 21:30:45 -0400
Subject: [PATCH 13/21] Update main.yml

yamllint
---
 meta/main.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 74b85b0..b8f84c4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,3 +1,4 @@
+---
 galaxy_info:
   playbook_name: fah
   author: Alexander Jacocks
@@ -9,11 +10,11 @@ galaxy_info:
   min_ansible_version: 2.2
 
   platforms:
-  - name: RHEL
-     versions:
-     - 7
-     - 8
-  - name: CentOS
-     versions:
-     - 7
-     - 8
+    - name: RHEL
+      versions:
+        - 7
+        - 8
+    - name: CentOS
+      versions:
+        - 7
+        - 8

From cf66605c10355dd93353f531a73897803b3700af Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Thu, 4 May 2023 21:03:02 -0400
Subject: [PATCH 14/21] Update dependencies.yaml

add a quick fix to make Ubuntu 22.04 work
---
 roles/fahclient/tasks/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/fahclient/tasks/dependencies.yaml b/roles/fahclient/tasks/dependencies.yaml
index e1e7fdb..99bb693 100644
--- a/roles/fahclient/tasks/dependencies.yaml
+++ b/roles/fahclient/tasks/dependencies.yaml
@@ -76,7 +76,7 @@
 
 - name: install FaH packages (DEB)
   apt:
-    deb: "/tmp/{{ item | regex_replace( '.*fah', 'fah' ) }}"
+    deb: "/tmp/fahclient_{{ item | regex_replace( '.*fah', 'fah' )_amd64.deb }}"
   with_items: "{{ fah_client_pkgs[ ansible_distribution ] }}"
   when:
     ('fahclient' not in ansible_facts.packages) and

From 0a28defd6e6ebf355bba0cfd166da7da4591d13d Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Thu, 18 May 2023 18:22:09 -0400
Subject: [PATCH 15/21] Fixed bug in dependencies.yaml

---
 roles/fahclient/tasks/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/fahclient/tasks/dependencies.yaml b/roles/fahclient/tasks/dependencies.yaml
index 99bb693..28f9552 100644
--- a/roles/fahclient/tasks/dependencies.yaml
+++ b/roles/fahclient/tasks/dependencies.yaml
@@ -76,7 +76,7 @@
 
 - name: install FaH packages (DEB)
   apt:
-    deb: "/tmp/fahclient_{{ item | regex_replace( '.*fah', 'fah' )_amd64.deb }}"
+    deb: "/tmp/fahclient_{{ item | regex_replace( '.*fah', 'fah' ) }}_amd64.deb"
   with_items: "{{ fah_client_pkgs[ ansible_distribution ] }}"
   when:
     ('fahclient' not in ansible_facts.packages) and

From 8eee21e338d72a888372e05bbafff12a29317766 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Sun, 21 May 2023 20:39:45 -0400
Subject: [PATCH 16/21] Update dependencies.yaml bug fix

---
 roles/fahclient/tasks/dependencies.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/fahclient/tasks/dependencies.yaml b/roles/fahclient/tasks/dependencies.yaml
index 28f9552..fe0efe8 100644
--- a/roles/fahclient/tasks/dependencies.yaml
+++ b/roles/fahclient/tasks/dependencies.yaml
@@ -54,7 +54,7 @@
     (ansible_distribution_major_version == '2')
 
 # TODO: This doesn't seem to actually generate anything
-- name: Gather package facts
+- name: Gather pchackage facts
   package_facts:
     manager: auto
 
@@ -77,7 +77,7 @@
 - name: install FaH packages (DEB)
   apt:
     deb: "/tmp/fahclient_{{ item | regex_replace( '.*fah', 'fah' ) }}_amd64.deb"
-  with_items: "{{ fah_client_pkgs[ ansible_distribution ] }}"
+  with_items: "{{ fah_client_pkgs[ ansible_distribution ][ fahclient_ver ] }}"
   when:
     ('fahclient' not in ansible_facts.packages) and
     (ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu')

From 591ae578c68e472dc0d09de74d22cc285c82fbe0 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Sun, 21 May 2023 21:00:16 -0400
Subject: [PATCH 17/21] Update service.yaml handle timeout

---
 roles/fahclient/tasks/service.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/fahclient/tasks/service.yaml b/roles/fahclient/tasks/service.yaml
index b53c45e..a80690c 100644
--- a/roles/fahclient/tasks/service.yaml
+++ b/roles/fahclient/tasks/service.yaml
@@ -11,6 +11,7 @@
   wait_for:
     path: /var/run/fahclient.pid
     state: absent
+  failed_when: false
 
 - name: Check to see if the init script exists
   stat:

From ee615d589932d8f9f4f44dcf4e85a6d11adfadfb Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Mon, 22 May 2023 13:01:12 -0400
Subject: [PATCH 18/21] Update service.yaml handle timeout

---
 roles/fahclient/tasks/service.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/fahclient/tasks/service.yaml b/roles/fahclient/tasks/service.yaml
index a80690c..6111708 100644
--- a/roles/fahclient/tasks/service.yaml
+++ b/roles/fahclient/tasks/service.yaml
@@ -13,6 +13,11 @@
     state: absent
   failed_when: false
 
+- name: Clean up pid file if timeout
+  file:
+    path: /var/run/fahclient.pid
+    state: absent
+
 - name: Check to see if the init script exists
   stat:
     path: /etc/init.d/FAHClient

From bdbee1835765b32ddf07723ed8d2dcde3670e4a7 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Mon, 22 May 2023 13:04:14 -0400
Subject: [PATCH 19/21] Update service.yaml - adjust timeouts

---
 roles/fahclient/tasks/service.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/fahclient/tasks/service.yaml b/roles/fahclient/tasks/service.yaml
index 6111708..15bd6be 100644
--- a/roles/fahclient/tasks/service.yaml
+++ b/roles/fahclient/tasks/service.yaml
@@ -11,6 +11,8 @@
   wait_for:
     path: /var/run/fahclient.pid
     state: absent
+    delay: 5
+    timeout: 60
   failed_when: false
 
 - name: Clean up pid file if timeout

From 0518f0ebffd4e8f8a904fcdc17a755f3b37ff2c5 Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 24 May 2023 19:40:13 -0400
Subject: [PATCH 20/21] Update dependencies.yaml - spelling

---
 roles/fahclient/tasks/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/fahclient/tasks/dependencies.yaml b/roles/fahclient/tasks/dependencies.yaml
index fe0efe8..62901cb 100644
--- a/roles/fahclient/tasks/dependencies.yaml
+++ b/roles/fahclient/tasks/dependencies.yaml
@@ -54,7 +54,7 @@
     (ansible_distribution_major_version == '2')
 
 # TODO: This doesn't seem to actually generate anything
-- name: Gather pchackage facts
+- name: Gather package facts
   package_facts:
     manager: auto
 

From 7e070b5b43de861face0a5e34dcb8f6a1a304c1b Mon Sep 17 00:00:00 2001
From: doritoes <39832079+doritoes@users.noreply.github.com>
Date: Wed, 24 May 2023 19:41:25 -0400
Subject: [PATCH 21/21] Update dependencies.yaml - fixed error

---
 roles/fahclient/tasks/dependencies.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/fahclient/tasks/dependencies.yaml b/roles/fahclient/tasks/dependencies.yaml
index 62901cb..d22c310 100644
--- a/roles/fahclient/tasks/dependencies.yaml
+++ b/roles/fahclient/tasks/dependencies.yaml
@@ -76,7 +76,7 @@
 
 - name: install FaH packages (DEB)
   apt:
-    deb: "/tmp/fahclient_{{ item | regex_replace( '.*fah', 'fah' ) }}_amd64.deb"
+    deb: "/tmp/{{ item | regex_replace( '.*fah', 'fah' ) }}"
   with_items: "{{ fah_client_pkgs[ ansible_distribution ][ fahclient_ver ] }}"
   when:
     ('fahclient' not in ansible_facts.packages) and