ISTI-ansible-roles
/
ansible-roles
4
0
Fork 3
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Andrea Dell'Amico 2019-10-28 13:00:00 +01:00 committed by Gitea
parent bdda0554e3 9913b65d09
commit 4f3f253fe1
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/roles/letsencrypt-acme-sh-client/tasks/old_acmetool_deb.yml → library/roles/letsencrypt-acme-sh-client/tasks/acmetool_deb.yml
View File

@ -9,4 +9,11 @@
- name: Remove the old letsencrypt acmetool repo on debian - name: Remove the old letsencrypt acmetool repo on debian
apt_repository: repo={{ letsencrypt_acme_debian_repo }} state=absent update_cache=yes apt_repository: repo={{ letsencrypt_acme_debian_repo }} state=absent update_cache=yes
- name: Install the socat utility, needed when using the http protocols to request the certificates
apt: pkg=socat state=present cache_valid_time=1800
- name: Install the git client if we are installing using git
apt: pkg=git state=present cache_valid_time=1800
when: letsencrypt_acme_sh_git_install
tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ] tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]

7
library/roles/letsencrypt-acme-sh-client/tasks/old_acmetool_rh.yml → library/roles/letsencrypt-acme-sh-client/tasks/acmetool_rh.yml
View File

@ -5,4 +5,11 @@
- name: Remove the acmetool repo file - name: Remove the acmetool repo file
file: dest=/etc/yum.repos.d/hlandau-acmetool-epel-7.repo state=absent file: dest=/etc/yum.repos.d/hlandau-acmetool-epel-7.repo state=absent
- name: Install the socat utility, needed when using the http protocols to request the certificates
yum: pkg=socat state=present
- name: Install the git client if we are installing using git
yum: pkg=git state=present
when: letsencrypt_acme_sh_git_install
tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ] tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]

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

@ -1,8 +1,8 @@
--- ---
- import_tasks: old_acmetool_deb.yml - import_tasks: acmetool_deb.yml
when: ansible_distribution_file_variety == "Debian" when: ansible_distribution_file_variety == "Debian"
- import_tasks: old_acmetool_rh.yml - import_tasks: acmetool_rh.yml
when: ansible_distribution_file_variety == "RedHat" when: ansible_distribution_file_variety == "RedHat"
- block: - block:
@ -18,13 +18,6 @@
tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ] tags: [ 'letsencrypt', 'letsencrypt_acme_sh' ]
- block: - block:
- name: Install the socat utility, needed when using the http protocols to request the certificates
apt: pkg=socat cache_valid_time=1800
- name: Install the git client if we are installing using git
apt: pkg=git cache_valid_time=1800
when: letsencrypt_acme_sh_git_install
- name: Create the letsencrypt acme user - name: Create the letsencrypt acme user
user: name={{ letsencrypt_acme_sh_user }} home={{ letsencrypt_acme_sh_user_home }} createhome=no shell=/usr/sbin/nologin system=yes user: name={{ letsencrypt_acme_sh_user }} home={{ letsencrypt_acme_sh_user_home }} createhome=no shell=/usr/sbin/nologin system=yes
tags: [ 'letsencrypt', 'letsencrypt_user' ] tags: [ 'letsencrypt', 'letsencrypt_user' ]