Skip to content
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

Add support for fullchain-privkey.pem file creation and update #12

Merged
merged 2 commits into from
May 1, 2016
Merged

Add support for fullchain-privkey.pem file creation and update #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cad4d7
Add support for fullchain-privkey.pem file creation and update
Apr 4, 2016
3832275
Move contents of renew_letsencrypt_cert.sh into a template file
Apr 5, 2016
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
28 changes: 25 additions & 3 deletions letsencrypt/domains.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
[ "$REMAINING" -gt "30" ] || exit 1
echo Domains $@ are in cert and cert is valid for $REMAINING days

/usr/local/bin/renew_letsencrypt_cert.sh:
file.managed:
- template: jinja
- source: salt://letsencrypt/files/renew_letsencrypt_cert.sh.jinja
- mode: 755
- require:
- file: /usr/local/bin/check_letsencrypt_cert.sh

{%
for setname, domainlist in salt['pillar.get'](
'letsencrypt:domainsets'
Expand All @@ -41,15 +49,29 @@ create-initial-cert-{{ setname }}-{{ domainlist | join('+') }}:

letsencrypt-crontab-{{ setname }}-{{ domainlist[0] }}:
cron.present:
- name: /usr/local/bin/check_letsencrypt_cert.sh {{ domainlist|join(' ') }} > /dev/null ||{{
letsencrypt.cli_install_dir
}}/letsencrypt-auto -d {{ domainlist|join(' -d ') }} certonly
- name: /usr/local/bin/renew_letsencrypt_cert.sh {{ domainlist|join(' ') }}
- month: '*'
- minute: random
- hour: random
- dayweek: '*'
- identifier: letsencrypt-{{ setname }}-{{ domainlist[0] }}
- require:
- cmd: create-initial-cert-{{ setname }}-{{ domainlist | join('+') }}
- file: /usr/local/bin/renew_letsencrypt_cert.sh

{% for domain in domainlist %}

create-fullchain-privkey-pem-for-{{ domain }}:
cmd.run:
- name: |
cat /etc/letsencrypt/live/{{ domain }}/fullchain.pem \
/etc/letsencrypt/live/{{ domain }}/privkey.pem \
> /etc/letsencrypt/live/{{ domain }}/fullchain-privkey.pem && \
chmod 600 /etc/letsencrypt/live/{{ domain }}/fullchain-privkey.pem
- creates: /etc/letsencrypt/live/{{ domain }}/fullchain-privkey.pem
- require:
- cmd: create-initial-cert-{{ setname }}-{{ domainlist | join('+') }}

{% endfor %}

{% endfor %}
13 changes: 13 additions & 0 deletions letsencrypt/files/renew_letsencrypt_cert.sh.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
{% from "letsencrypt/map.jinja" import letsencrypt with context %}
for DOMAIN in "$@"
do
if ! /usr/local/bin/check_letsencrypt_cert.sh "$DOMAIN" > /dev/null
then
{{ letsencrypt.cli_install_dir }}/letsencrypt-auto -d "$DOMAIN" certonly || exit 1
cat /etc/letsencrypt/live/${DOMAIN}/fullchain.pem \
/etc/letsencrypt/live/${DOMAIN}/privkey.pem \
> /etc/letsencrypt/live/${DOMAIN}/fullchain-privkey.pem || exit 1
chmod 600 /etc/letsencrypt/live/${DOMAIN}/fullchain-privkey.pem || exit 1
fi
done