From 134a0feb5ba4938a0af31037304fd234b4b79c6f Mon Sep 17 00:00:00 2001
From: AnsibleRoles <>
Date: Mon, 30 Dec 2019 21:37:29 +0000
Subject: [PATCH 01/15] Initial commit

---
 .gitignore | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md  |  2 ++
 2 files changed, 92 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 README.md

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6caeae7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,90 @@
+# ---> Ansible
+*.retry
+
+# ---> Vim
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+# ---> Linux
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# ---> Windows
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# ---> macOS
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon

+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..53a677e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,2 @@
+# ensure_repo_fdragon
+

From f393e9cf0306ce4d17b75db47bceb6daf1443b0b Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 30 Dec 2019 20:23:51 -0600
Subject: [PATCH 02/15] Enable Fedora 30+ and EPEL 6+ support

---
 .gitignore                | 75 +++++++++++++++++++++------------------
 .travis.yml               | 29 +++++++++++++++
 README.md                 | 38 +++++++++++++++++++-
 defaults/main.yml         |  2 ++
 handlers/main.yml         |  7 ++++
 meta/main.yml             | 53 +++++++++++++++++++++++++++
 tasks/main.yml            | 45 +++++++++++++++++++++++
 tests/inventory           |  2 ++
 tests/test.yml            |  5 +++
 vars/Fedora-30-x86_64.yml |  5 +++
 vars/Fedora-31-x86_64.yml |  5 +++
 vars/RedHat-6-i386.yml    |  5 +++
 vars/RedHat-6-x86_64.yml  |  5 +++
 vars/RedHat-7-x86_64.yml  |  5 +++
 vars/RedHat-8-x86_64.yml  |  5 +++
 vars/default.yml          |  2 ++
 vars/main.yml             |  2 ++
 17 files changed, 255 insertions(+), 35 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 defaults/main.yml
 create mode 100644 handlers/main.yml
 create mode 100644 meta/main.yml
 create mode 100644 tasks/main.yml
 create mode 100644 tests/inventory
 create mode 100644 tests/test.yml
 create mode 100644 vars/Fedora-30-x86_64.yml
 create mode 100644 vars/Fedora-31-x86_64.yml
 create mode 100644 vars/RedHat-6-i386.yml
 create mode 100644 vars/RedHat-6-x86_64.yml
 create mode 100644 vars/RedHat-7-x86_64.yml
 create mode 100644 vars/RedHat-8-x86_64.yml
 create mode 100644 vars/default.yml
 create mode 100644 vars/main.yml

diff --git a/.gitignore b/.gitignore
index 6caeae7..ce59d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,40 +1,6 @@
 # ---> Ansible
 *.retry
 
-# ---> Vim
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary
-.netrwhist
-*~
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
-
-# ---> Linux
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
 # ---> Windows
 # Windows thumbnail cache files
 Thumbs.db
@@ -88,3 +54,44 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+# ---> Linux
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+# ---> Vim
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/README.md b/README.md
index 53a677e..785b9a1 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,38 @@
-# ensure_repo_fdragon
+Role Name
+=========
 
+Deploy fdragon repo for EL/Fedora
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+LGPL >= 3
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/defaults/main.yml b/defaults/main.yml
new file mode 100644
index 0000000..f00dc5b
--- /dev/null
+++ b/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+# defaults file for ensure_repo_fdragon
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
new file mode 100644
index 0000000..4ecd87e
--- /dev/null
+++ b/handlers/main.yml
@@ -0,0 +1,7 @@
+---
+# handlers file for ensure_repo_fdragon
+- name: 'ensure_repo_fdragon.package_facts'
+  package_facts:
+- name: 'ensure_repo_fdragon.service_facts'
+  service_facts:
+
diff --git a/meta/main.yml b/meta/main.yml
new file mode 100644
index 0000000..227ad9c
--- /dev/null
+++ b/meta/main.yml
@@ -0,0 +1,53 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.9
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
+  
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
new file mode 100644
index 0000000..4e5f4c1
--- /dev/null
+++ b/tasks/main.yml
@@ -0,0 +1,45 @@
+---
+# tasks file for ensure_repo_fdragon
+- name: 'include variables'
+  when:
+    - ansible_system == 'Linux'
+  include_vars:
+    file: '{{ lookup("first_found", findme ) }}'
+    name: 'ensure_repo_fdragon'
+  vars:
+    findme:
+      files:
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
+        - '{{ ansible_distribution }}-default.yml'
+        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
+        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
+        - '{{ ansible_os_family }}-default.yml'
+        - 'default.yml'
+      paths:
+        - '../vars/'
+      errors: 'ignore'
+- name: 'package discovery'
+  when:
+    - ansible_system == 'Linux'
+    - packages is not defined
+  package_facts:
+- name: 'ensure packages'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_repo_fdragon is defined
+    - ensure_repo_fdragon.package_list is defined
+    - ensure_repo_fdragon.package_list is iterable
+    - packages[item.name] is not defined
+  package:
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_repo_fdragon.package_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_repo_fdragon.package_facts'
+    - 'ensure_repo_fdragon.service_facts'
+- name: 'flush handlers'
+  meta: 'flush_handlers'
+
diff --git a/tests/inventory b/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/tests/test.yml b/tests/test.yml
new file mode 100644
index 0000000..df6e16e
--- /dev/null
+++ b/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ensure_repo_fdragon
\ No newline at end of file
diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30-x86_64.yml
new file mode 100644
index 0000000..5132bcf
--- /dev/null
+++ b/vars/Fedora-30-x86_64.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/fedora/30/x86_64/fdragon-release-2019.11.02-1.fc30.x86_64.rpm' }
+
diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31-x86_64.yml
new file mode 100644
index 0000000..3196354
--- /dev/null
+++ b/vars/Fedora-31-x86_64.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/fedora/31/x86_64/fdragon-release-2019.11.02-1.fc31.x86_64.rpm' }
+
diff --git a/vars/RedHat-6-i386.yml b/vars/RedHat-6-i386.yml
new file mode 100644
index 0000000..bf011c6
--- /dev/null
+++ b/vars/RedHat-6-i386.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/6/i386/fdragon-release-2019.11.02-1.el6.i686.rpm' }
+
diff --git a/vars/RedHat-6-x86_64.yml b/vars/RedHat-6-x86_64.yml
new file mode 100644
index 0000000..bd1bf45
--- /dev/null
+++ b/vars/RedHat-6-x86_64.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/6/x86_64/fdragon-release-2019.11.02-1.el6.x86_64.rpm' }
+
diff --git a/vars/RedHat-7-x86_64.yml b/vars/RedHat-7-x86_64.yml
new file mode 100644
index 0000000..5526230
--- /dev/null
+++ b/vars/RedHat-7-x86_64.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/7/x86_64/fdragon-release-2019.11.02-1.el7.x86_64.rpm' }
+
diff --git a/vars/RedHat-8-x86_64.yml b/vars/RedHat-8-x86_64.yml
new file mode 100644
index 0000000..01fb308
--- /dev/null
+++ b/vars/RedHat-8-x86_64.yml
@@ -0,0 +1,5 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/8/x86_64/fdragon-release-2019.11.02-1.el8.x86_64.rpm' }
+
diff --git a/vars/default.yml b/vars/default.yml
new file mode 100644
index 0000000..e438029
--- /dev/null
+++ b/vars/default.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_repo_fdragon
\ No newline at end of file
diff --git a/vars/main.yml b/vars/main.yml
new file mode 100644
index 0000000..e438029
--- /dev/null
+++ b/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for ensure_repo_fdragon
\ No newline at end of file

From 6910e92cc84af5f7c97aea88630dee3c704ddbbd Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 30 Dec 2019 20:29:55 -0600
Subject: [PATCH 03/15] Install by URL not name

---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 4e5f4c1..f6fa978 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -32,7 +32,7 @@
     - ensure_repo_fdragon.package_list is iterable
     - packages[item.name] is not defined
   package:
-    name: '{{ item.name }}'
+    name: '{{ item.url }}'
     state: '{{ item.state }}'
   loop: '{{ ensure_repo_fdragon.package_list }}'
   loop_control:

From 7a94ac696f531913276dd6cbf5b02478d0ac6990 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 28 Mar 2020 17:42:13 -0500
Subject: [PATCH 04/15] update galaxy metadat

---
 meta/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 227ad9c..8221e6d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,6 +1,6 @@
 galaxy_info:
-  author: your name
-  description: your role description
+  author: Jason Rothstein
+  description: Deploy personal repository
   company: your company (optional)
 
   # If the issue tracker for your role is not on github, uncomment the
@@ -14,7 +14,7 @@ galaxy_info:
   # - GPL-3.0-only
   # - Apache-2.0
   # - CC-BY-4.0
-  license: license (GPL-2.0-or-later, MIT, etc)
+  license: LGPL-3.0-or-later
 
   min_ansible_version: 2.9
 

From f8c7c135e73d301e666fa12b787bca6fa2079193 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sat, 28 Mar 2020 17:44:10 -0500
Subject: [PATCH 05/15] Make dictionaries maintainable

---
 vars/Fedora-30-x86_64.yml | 4 +++-
 vars/Fedora-31-x86_64.yml | 4 +++-
 vars/RedHat-6-i386.yml    | 4 +++-
 vars/RedHat-6-x86_64.yml  | 4 +++-
 vars/RedHat-7-x86_64.yml  | 4 +++-
 vars/RedHat-8-x86_64.yml  | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/vars/Fedora-30-x86_64.yml b/vars/Fedora-30-x86_64.yml
index 5132bcf..9e4c05b 100644
--- a/vars/Fedora-30-x86_64.yml
+++ b/vars/Fedora-30-x86_64.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/fedora/30/x86_64/fdragon-release-2019.11.02-1.fc30.x86_64.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/fedora/30/x86_64/fdragon-release-2019.11.02-1.fc30.x86_64.rpm'
 
diff --git a/vars/Fedora-31-x86_64.yml b/vars/Fedora-31-x86_64.yml
index 3196354..757fd8d 100644
--- a/vars/Fedora-31-x86_64.yml
+++ b/vars/Fedora-31-x86_64.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/fedora/31/x86_64/fdragon-release-2019.11.02-1.fc31.x86_64.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/fedora/31/x86_64/fdragon-release-2019.11.02-1.fc31.x86_64.rpm'
 
diff --git a/vars/RedHat-6-i386.yml b/vars/RedHat-6-i386.yml
index bf011c6..e2bf385 100644
--- a/vars/RedHat-6-i386.yml
+++ b/vars/RedHat-6-i386.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/6/i386/fdragon-release-2019.11.02-1.el6.i686.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/epel/6/i386/fdragon-release-2019.11.02-1.el6.i686.rpm'
 
diff --git a/vars/RedHat-6-x86_64.yml b/vars/RedHat-6-x86_64.yml
index bd1bf45..16160be 100644
--- a/vars/RedHat-6-x86_64.yml
+++ b/vars/RedHat-6-x86_64.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/6/x86_64/fdragon-release-2019.11.02-1.el6.x86_64.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/epel/6/x86_64/fdragon-release-2019.11.02-1.el6.x86_64.rpm'
 
diff --git a/vars/RedHat-7-x86_64.yml b/vars/RedHat-7-x86_64.yml
index 5526230..92b33fa 100644
--- a/vars/RedHat-7-x86_64.yml
+++ b/vars/RedHat-7-x86_64.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/7/x86_64/fdragon-release-2019.11.02-1.el7.x86_64.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/epel/7/x86_64/fdragon-release-2019.11.02-1.el7.x86_64.rpm'
 
diff --git a/vars/RedHat-8-x86_64.yml b/vars/RedHat-8-x86_64.yml
index 01fb308..fa08c4e 100644
--- a/vars/RedHat-8-x86_64.yml
+++ b/vars/RedHat-8-x86_64.yml
@@ -1,5 +1,7 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - { name: 'fdragon-release', state: 'present', url: 'https://fdragon.org/packages/epel/8/x86_64/fdragon-release-2019.11.02-1.el8.x86_64.rpm' }
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/epel/8/x86_64/fdragon-release-2019.11.02-1.el8.x86_64.rpm'
 

From 01012ddeffb379585ff1dbb1b11bc0c5dc9d47a7 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 29 Nov 2020 21:42:28 -0600
Subject: [PATCH 06/15] Add Fedora 32 support

---
 vars/Fedora-32-x86_64.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 vars/Fedora-32-x86_64.yml

diff --git a/vars/Fedora-32-x86_64.yml b/vars/Fedora-32-x86_64.yml
new file mode 100644
index 0000000..592ccef
--- /dev/null
+++ b/vars/Fedora-32-x86_64.yml
@@ -0,0 +1,7 @@
+---
+# vars file for ensure_repo_fdragon
+package_list:
+  - name: 'fdragon-release'
+    state: 'present'
+    url: 'https://fdragon.org/packages/fedora/32/x86_64/fdragon-release-2020.03.28-1.fc32.x86_64.rpm'
+

From eb0ebd829bffa09d7f3534e6f26b20537706c8d4 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 29 Nov 2020 21:42:47 -0600
Subject: [PATCH 07/15] Be specific about the supported EL release

---
 vars/{RedHat-6-i386.yml => CentOS-6-i386.yml}     | 0
 vars/{RedHat-6-x86_64.yml => CentOS-6-x86_64.yml} | 0
 vars/{RedHat-7-x86_64.yml => CentOS-7-x86_64.yml} | 0
 vars/{RedHat-8-x86_64.yml => CentOS-8-x86_64.yml} | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename vars/{RedHat-6-i386.yml => CentOS-6-i386.yml} (100%)
 rename vars/{RedHat-6-x86_64.yml => CentOS-6-x86_64.yml} (100%)
 rename vars/{RedHat-7-x86_64.yml => CentOS-7-x86_64.yml} (100%)
 rename vars/{RedHat-8-x86_64.yml => CentOS-8-x86_64.yml} (100%)

diff --git a/vars/RedHat-6-i386.yml b/vars/CentOS-6-i386.yml
similarity index 100%
rename from vars/RedHat-6-i386.yml
rename to vars/CentOS-6-i386.yml
diff --git a/vars/RedHat-6-x86_64.yml b/vars/CentOS-6-x86_64.yml
similarity index 100%
rename from vars/RedHat-6-x86_64.yml
rename to vars/CentOS-6-x86_64.yml
diff --git a/vars/RedHat-7-x86_64.yml b/vars/CentOS-7-x86_64.yml
similarity index 100%
rename from vars/RedHat-7-x86_64.yml
rename to vars/CentOS-7-x86_64.yml
diff --git a/vars/RedHat-8-x86_64.yml b/vars/CentOS-8-x86_64.yml
similarity index 100%
rename from vars/RedHat-8-x86_64.yml
rename to vars/CentOS-8-x86_64.yml

From 3dc9a813739d12ea8d6871b91d0ee0b986acaefe Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 29 Nov 2020 21:44:30 -0600
Subject: [PATCH 08/15] Use Ansible FQCN

---
 README.md         | 2 +-
 handlers/main.yml | 4 ++--
 tasks/main.yml    | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 785b9a1..2c2e81c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Including an example of how to use your role (for instance, with variables passe
 License
 -------
 
-LGPL >= 3
+LGPL-3.0-or-later
 
 Author Information
 ------------------
diff --git a/handlers/main.yml b/handlers/main.yml
index 4ecd87e..d96870d 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 # handlers file for ensure_repo_fdragon
 - name: 'ensure_repo_fdragon.package_facts'
-  package_facts:
+  ansible.builtin.package_facts:
 - name: 'ensure_repo_fdragon.service_facts'
-  service_facts:
+  ansible.builtin.service_facts:
 
diff --git a/tasks/main.yml b/tasks/main.yml
index f6fa978..adf253f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,7 +23,7 @@
   when:
     - ansible_system == 'Linux'
     - packages is not defined
-  package_facts:
+  ansible.builtin.package_facts:
 - name: 'ensure packages'
   when:
     - ansible_system == 'Linux'
@@ -31,7 +31,8 @@
     - ensure_repo_fdragon.package_list is defined
     - ensure_repo_fdragon.package_list is iterable
     - packages[item.name] is not defined
-  package:
+  ansible.builtin.package:
+    disable_gpg_check: 'yes'
     name: '{{ item.url }}'
     state: '{{ item.state }}'
   loop: '{{ ensure_repo_fdragon.package_list }}'

From 6915ca636cd7dddd3687f5164c7f96845e189d69 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 6 Dec 2020 21:15:06 -0600
Subject: [PATCH 09/15] Fix syntax to be default(omit)

---
 tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index adf253f..625621d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -32,7 +32,7 @@
     - ensure_repo_fdragon.package_list is iterable
     - packages[item.name] is not defined
   ansible.builtin.package:
-    disable_gpg_check: 'yes'
+    disable_gpg_check: '{{ item.disable_gpg_check | default(omit) }}'
     name: '{{ item.url }}'
     state: '{{ item.state }}'
   loop: '{{ ensure_repo_fdragon.package_list }}'

From ae51d56ecc39cdae3f1daa2013d4fffaf675c42d Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 7 Dec 2020 05:55:42 -0600
Subject: [PATCH 10/15] Disable GPG check for repo install

---
 vars/CentOS-8-x86_64.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/CentOS-8-x86_64.yml b/vars/CentOS-8-x86_64.yml
index fa08c4e..c48e3ff 100644
--- a/vars/CentOS-8-x86_64.yml
+++ b/vars/CentOS-8-x86_64.yml
@@ -1,7 +1,8 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - name: 'fdragon-release'
+  - disable_gpg_check: 'yes'
+    name: 'fdragon-release'
     state: 'present'
     url: 'https://fdragon.org/packages/epel/8/x86_64/fdragon-release-2019.11.02-1.el8.x86_64.rpm'
 

From af72c4a0d65c148d14718bdaa23d9f891bc09e83 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Mon, 7 Dec 2020 05:57:44 -0600
Subject: [PATCH 11/15] Disable GPG key check for Fedora 32 install

---
 vars/Fedora-32-x86_64.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vars/Fedora-32-x86_64.yml b/vars/Fedora-32-x86_64.yml
index 592ccef..f68b063 100644
--- a/vars/Fedora-32-x86_64.yml
+++ b/vars/Fedora-32-x86_64.yml
@@ -1,7 +1,8 @@
 ---
 # vars file for ensure_repo_fdragon
 package_list:
-  - name: 'fdragon-release'
+  - disable_gpg_check: 'yes'
+    name: 'fdragon-release'
     state: 'present'
     url: 'https://fdragon.org/packages/fedora/32/x86_64/fdragon-release-2020.03.28-1.fc32.x86_64.rpm'
 

From 0b530f5a299cf589f671ff043584a4445fc1dda7 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 20 Dec 2020 07:43:19 -0600
Subject: [PATCH 12/15] Do service discovery as well as package discovery

---
 tasks/main.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index 625621d..72d58ef 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -24,6 +24,11 @@
     - ansible_system == 'Linux'
     - packages is not defined
   ansible.builtin.package_facts:
+- name: 'service discovery'
+  when:
+    - ansible_system == 'Linux'
+    - services is not defined
+  ansible.builtin.service_facts:
 - name: 'ensure packages'
   when:
     - ansible_system == 'Linux'

From c8aae64b192427860c46b53b0a0aa9e8a27bad37 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:30:01 -0500
Subject: [PATCH 13/15] Update handlers

---
 handlers/main.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index d96870d..b7a9777 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,4 +4,24 @@
   ansible.builtin.package_facts:
 - name: 'ensure_repo_fdragon.service_facts'
   ansible.builtin.service_facts:
-
+- name: 'ensure_repo_fdragon.service_reload'
+  when:
+    - ansible_system == 'Linux'
+    - ansible_service_mgr == 'systemd'
+    - ensure_repo_fdragon is defined
+  ansible.builtin.systemd:
+    daemon_reload: 'yes'
+- name: 'ensure_repo_fdragon.services'
+  when:
+    - ansible_system == 'Linux'
+    - ensure_repo_fdragon is defined
+    - ensure_repo_fdragon.service_list is defined
+    - ensure_repo_fdragon.service_list is iterable
+    - item.state == 'started'
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: 'restarted'
+  loop: '{{ ensure_repo_fdragon.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be restarted'

From 9268a5f06a011ae7667dcb9894692755599e8947 Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 5 Jun 2022 16:48:35 -0500
Subject: [PATCH 14/15] Update tasks

---
 tasks/main.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tasks/main.yml b/tasks/main.yml
index 72d58ef..4f194a4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -46,6 +46,16 @@
   notify:
     - 'ensure_repo_fdragon.package_facts'
     - 'ensure_repo_fdragon.service_facts'
+  ansible.builtin.service:
+    enabled: '{{ item.enabled }}'
+    name: '{{ item.name }}'
+    state: '{{ item.state }}'
+  loop: '{{ ensure_repo_fdragon.service_list }}'
+  loop_control:
+    label: '{{ item.name }} will be {{ item.state }}'
+  notify:
+    - 'ensure_repo_fdragon.package_facts'
+    - 'ensure_repo_fdragon.service_facts'
 - name: 'flush handlers'
   meta: 'flush_handlers'
 

From 5aeefca7241c6b62bebd2f8f92ddab6d608b28ab Mon Sep 17 00:00:00 2001
From: Jason Rothstein <fdragon@fdragon.org>
Date: Sun, 25 May 2025 20:13:13 -0500
Subject: [PATCH 15/15] Hanlder improvements

Signed-off-by: Jason Rothstein <fdragon@fdragon.org>
---
 handlers/main.yml | 4 +++-
 tasks/main.yml    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index b7a9777..ba70375 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -11,7 +11,7 @@
     - ensure_repo_fdragon is defined
   ansible.builtin.systemd:
     daemon_reload: 'yes'
-- name: 'ensure_repo_fdragon.services'
+- name: 'ensure_repo_fdragon.service_restart'
   when:
     - ansible_system == 'Linux'
     - ensure_repo_fdragon is defined
@@ -25,3 +25,5 @@
   loop: '{{ ensure_repo_fdragon.service_list }}'
   loop_control:
     label: '{{ item.name }} will be restarted'
+...
+
diff --git a/tasks/main.yml b/tasks/main.yml
index 4f194a4..a8c623e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -58,4 +58,5 @@
     - 'ensure_repo_fdragon.service_facts'
 - name: 'flush handlers'
   meta: 'flush_handlers'
+...