jpp/ansible-roles
1
0
Fork 0
mirror of https://git.lapiole.org/dani/ansible-roles.git synced 2025-11-03 12:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2022-09-13 10:00

Browse Source
This commit is contained in:
Daniel Berteaud
2022-09-13 10:00:07 +02:00
parent 419814390c
commit 3d8b59673b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/sftpgo/tasks/conf.yml
View File

@@ -6,15 +6,15 @@
# We do so by configuring certificate_file: letsencrypt:foo.example.org in SFTPGo configuration
- name: Handle Let's Encrypt cert
set_fact:
sftpgo_conf: "{{ sftpgo_conf | combine({ item: {'certificate_file': sftpgo_root_dir ~ '/etc/ssl/' ~ item ~ '.crt', 'certificate_key_file': sftpgo_root_dir ~ '/etc/ssl/' ~ item ~ '.key'}}, recursive=True) }}"
sftpgo_conf: "{{ sftpgo_conf | combine({ item: {'bindings': {'certificate_file': sftpgo_root_dir ~ '/etc/ssl/' ~ item ~ '.crt', 'certificate_key_file': sftpgo_root_dir ~ '/etc/ssl/' ~ item ~ '.key'} } }, recursive=True) }}"
loop:
- ftpd
- webdavd
- httpd
- telemetry
when:
- sftpgo_conf[item].certificate_file is defined
- sftpgo_conf[item].certificate_file is search('^letsencrypt:')
- sftpgo_conf[item].bindings.certificate_file is defined
- sftpgo_conf[item].bindings.certificate_file is search('^letsencrypt:')
tags: sftpgo
- name: Deploy sftpgo config

4
roles/sftpgo/templates/dehydrated_hook.j2
View File

@@ -2,8 +2,8 @@
SFTPGO_RELOAD=0
{% for service in ['ftpd','webdavd','httpd','telemetry'] %}
{% if sftpgo_conf[service].certificate_file is defined and sftpgo_conf[service].certificate_file is search('^letsencrypt:') %}
{% set certificate_name = sftpgo_conf[service].certificate_file | regex_replace('^letsencrypt:', '') %}
{% if sftpgo_conf[service].bindings.certificate_file is defined and sftpgo_conf[service].bindings.certificate_file is search('^letsencrypt:') %}
{% set certificate_name = sftpgo_conf[service].bindings.certificate_file | regex_replace('^letsencrypt:', '') %}
if [ $1 == "{{ certificate_name }}" ]; then
SFTPGO_RELOAD=1
cp /var/lib/dehydrated/certificates/certs/{{ certificate_name }}/fullchain.pem {{ sftpgo_root_dir }}/etc/ssl/{{ service }}.crt