Skip to content

Fix includes and requisites #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhansen wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix includes and requisites #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd0c701
fix(config): add missing requisite
rhansen Jul 23, 2022
5646457
fix(domains): add missing includes and requisites
rhansen Jul 23, 2022
8bb89bd
fix(domains): ignore requisites when removing crontab entry
rhansen Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions letsencrypt/config.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ letsencrypt-config:
- makedirs: true
- context:
config: {{ letsencrypt.config | json }}
- require:
- file: letsencrypt-config-directory
12 changes: 12 additions & 0 deletions letsencrypt/domains.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

{% from "letsencrypt/map.jinja" import letsencrypt with context %}

include:
- letsencrypt.install
- letsencrypt.config

{% if letsencrypt.install_method == 'package' %}
{% set check_cert_cmd = letsencrypt._cli_path ~ ' certificates --cert-name' %}
{% set renew_cert_cmd = letsencrypt._cli_path ~ ' renew' %}
Expand Down Expand Up @@ -30,6 +34,12 @@
- template: jinja
- source: salt://letsencrypt/files/check_letsencrypt_cert.sh.jinja
- mode: 755
- require:
{%- if letsencrypt.install_method == 'git' %}
- git: letsencrypt-client
{%- elif letsencrypt.install_method == 'pip' %}
- virtualenv: letsencrypt-client
{%- endif %}

{{ renew_cert_cmd }}:
file.{{ old_renew_cert_cmd_state }}:
Expand Down Expand Up @@ -97,13 +107,15 @@ letsencrypt-crontab-{{ setname }}-{{ domainlist[0] }}:
- hour: '{{ letsencrypt.cron.hour }}'
- dayweek: '{{ letsencrypt.cron.dayweek }}'
- identifier: letsencrypt-{{ setname }}-{{ domainlist[0] }}
{%- if old_cron_state == 'present' %}
- require:
- cmd: create-initial-cert-{{ setname }}-{{ domainlist | join('+') }}
{% if letsencrypt.install_method == 'package' %}
- pkg: letsencrypt-client
{% else %}
- file: {{ renew_cert_cmd }}
{% endif %}
{%- endif %}

create-fullchain-privkey-pem-for-{{ setname }}:
cmd.run:
Expand Down