Merge branch 'master' of adellam/ansible-roles into master

library/roles/letsencrypt-acme-sh-client/tasks/main.yml

@@ -1,14 +1,11 @@
 ---
+- import_tasks: old_acmetool_deb.yml
+  when: ansible_distribution_file_variety == "Debian"
+
+- import_tasks: old_acmetool_rh.yml
+  when: ansible_distribution_file_variety == "RedHat"
+
 - block: 
-  - name: Remove the old acme package because the tool is not supported anymore.
-    apt: pkg=acmetool state=absent purge=yes
-
-  - name: Remove the old letsencrypt acmetool repo on ubuntu
-    apt_repository: repo={{ letsencrypt_acme_ppa_repo }} state=absent update_cache=yes
-
-  - name: Remove the old letsencrypt acmetool repo on debian
-    apt_repository: repo={{ letsencrypt_acme_debian_repo }} state=absent update_cache=yes
-
   - name: Remove the sudoers config needed to run the old acmetool package hooks
     file: dest=/etc/sudoers.d/letsencrypt-acme state=absent
 
@@ -53,7 +50,7 @@
 
   - name: Install the script that will run the services hooks when a certificate is installed
     template: src=acme-services-hook.j2 dest=/usr/local/bin/acme-services-hook owner=root group=acme mode=0750
-    
+
   - name: Install the scripts that will be run as a cron job
     copy: src={{ item }} dest=/usr/local/bin/{{ item }} owner=root group=acme mode=0750
     with_items:

library/roles/letsencrypt-acme-sh-client/tasks/old_acmetool_deb.yml

@@ -0,0 +1,12 @@
+---
+- block: 
+  - name: Remove the old acme package because the tool is not supported anymore.
+    apt: pkg=acmetool state=absent purge=yes
+
+  - name: Remove the old letsencrypt acmetool repo on ubuntu
+    apt_repository: repo={{ letsencrypt_acme_ppa_repo }} state=absent update_cache=yes
+
+  - name: Remove the old letsencrypt acmetool repo on debian
+    apt_repository: repo={{ letsencrypt_acme_debian_repo }} state=absent update_cache=yes
+
+  tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]

library/roles/letsencrypt-acme-sh-client/tasks/old_acmetool_rh.yml

@@ -0,0 +1,8 @@
+- block: 
+  - name: Remove the old acme package because the tool is not supported anymore.
+    yum: pkg=acmetool state=absent
+
+  - name: Remove the acmetool repo file
+    file: dest=/etc/yum.repos.d/hlandau-acmetool-epel-7.repo state=absent
+
+  tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]