tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
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-08-07 19:10:10 +02:00 committed by Gitea
parent ae458d9bf7 52211d86ce
commit a135ea5d0e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/centos/roles/letsencrypt-acmetool-client/defaults/main.yml
View File

@ -12,7 +12,7 @@ letsencrypt_acme_user_home: /var/lib/acme
letsencrypt_acme_log_dir: /var/log/acme letsencrypt_acme_log_dir: /var/log/acme
letsencrypt_acme_command: acmetool letsencrypt_acme_command: acmetool
letsencrypt_acme_command_opts: '--batch --xlog.syslog --xlog.severity=info' letsencrypt_acme_command_opts: '--hooks={{ letsencrypt_acme_services_scripts_dir }} --batch --xlog.syslog --xlog.severity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE'
letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf' letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf'
letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired' letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired'
letsencrypt_acme_certs_dir: '{{ letsencrypt_acme_user_home }}/live/{{ ansible_fqdn }}' letsencrypt_acme_certs_dir: '{{ letsencrypt_acme_user_home }}/live/{{ ansible_fqdn }}'

2
library/roles/letsencrypt-acmetool-client/defaults/main.yml
View File

@ -14,7 +14,7 @@ letsencrypt_acme_user_home: /var/lib/acme
letsencrypt_acme_log_dir: /var/log/acme letsencrypt_acme_log_dir: /var/log/acme
letsencrypt_acme_command: acmetool letsencrypt_acme_command: acmetool
letsencrypt_acme_command_opts: '--batch --xlog.syslog --xlog.syslogseverity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE' letsencrypt_acme_command_opts: '--hooks={{ letsencrypt_acme_services_scripts_dir }} --batch --xlog.syslog --xlog.syslogseverity=INFO --xlog.file="{{ letsencrypt_acme_log_dir }}/certrequest.log" --xlog.fileseverity=TRACE'
letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf' letsencrypt_acme_config_dir: '{{ letsencrypt_acme_user_home }}/conf'
letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired' letsencrypt_acme_certsconf_dir: '{{ letsencrypt_acme_user_home }}/desired'
letsencrypt_acme_dest_dir: '{{ ansible_fqdn }}' letsencrypt_acme_dest_dir: '{{ ansible_fqdn }}'

2
library/roles/letsencrypt-acmetool-client/tasks/main.yml
View File

@ -109,7 +109,7 @@
- name: Install a script that requests the certificates and manage the self signed certificate - name: Install a script that requests the certificates and manage the self signed certificate
template: src=acme-cert-request.sh.j2 dest=/usr/local/bin/acme-cert-request owner=root group=root mode=0755 template: src=acme-cert-request.sh.j2 dest=/usr/local/bin/acme-cert-request owner=root group=root mode=0755
when: letsencrypt_acme_install when: letsencrypt_acme_install
tags: [ 'letsencrypt', 'letsencrypt_cron' ] tags: [ 'letsencrypt', 'letsencrypt_cron', 'letsencrypt_hook' ]
- name: Set certificates as to be revoked - name: Set certificates as to be revoked
become: True become: True