diff --git a/roles/webserver-core/letsencrypt/files/cli.ini b/roles/webserver-core/letsencrypt/files/cli.ini index 688f5eb..4e76889 100644 --- a/roles/webserver-core/letsencrypt/files/cli.ini +++ b/roles/webserver-core/letsencrypt/files/cli.ini @@ -1,27 +1,27 @@ # ------------------------------------------------------------- # Let's encrypt # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2017-04-27 # License: Trivial work, not eligible to copyright # Source file: roles/webserver-core/letsencrypt/files/cli.ini # ------------------------------------------------------------- # # <auto-generated> # This file is managed by our rOPS SaltStack repository. # # Changes to this file may cause incorrect behavior # and will be lost if the state is redeployed. # </auto-generated> # Configuration -server = https://acme-v01.api.letsencrypt.org/directory +server = https://acme-v02.api.letsencrypt.org/directory authenticator = webroot webroot-path = /var/letsencrypt-auto # Automation email = ops-tls@nasqueron.org agree-tos = True keep-until-expiring = True eff-email = False expand = True diff --git a/roles/webserver-core/letsencrypt/software.sls b/roles/webserver-core/letsencrypt/software.sls index 8db530f..026d5af 100644 --- a/roles/webserver-core/letsencrypt/software.sls +++ b/roles/webserver-core/letsencrypt/software.sls @@ -1,43 +1,44 @@ # ------------------------------------------------------------- # Salt — Let's encrypt certificates # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2017-04-27 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- {% from "map.jinja" import dirs, packages with context %} # ------------------------------------------------------------- # Software # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - letsencrypt_software: pkg.installed: - name: {{ packages.certbot }} # ------------------------------------------------------------- # Working directory # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /var/letsencrypt-auto: file.directory: - user: root - dir_mode: 711 # ------------------------------------------------------------- # Configuration file # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ dirs.etc }}/letsencrypt/cli.ini: file.managed: - source: salt://roles/webserver-core/letsencrypt/files/cli.ini + - makedirs: True # ------------------------------------------------------------- # Extra utilities # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ dirs.bin }}/check-letsencrypt-certificates: file.managed: - source: salt://roles/webserver-core/letsencrypt/files/check-letsencrypt-certificates.py - mode: 755