Skip to content
Snippets Groups Projects
Commit 030908b7 authored by sofubi's avatar sofubi :anchor:
Browse files

Changes nginx.yml taks to install certbot snap

Changes packages.yml task tin install snapd
parent 8b53f6a5
No related branches found
No related tags found
No related merge requests found
Pipeline #12698 failed
...@@ -14,23 +14,34 @@ ...@@ -14,23 +14,34 @@
state: started state: started
# from https://gist.github.com/mattiaslundberg/ba214a35060d3c8603e9b1ec8627d349 # from https://gist.github.com/mattiaslundberg/ba214a35060d3c8603e9b1ec8627d349
- name: "Download certbot-auto" - name: "Prepare snapd for certbot installation"
when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
become: true become: true
get_url: command: snap install core
url: https://dl.eff.org/certbot-auto
dest: /usr/local/bin/certbot-auto
mode: 0750
- name: "Install certbot using certbot-auto" - name: "Refresh core snap before installing certbot"
when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled when: funkwhwale_nginx_managed and funkwhale_letsencrypt_enabled
become: true
command: snap refresh core
- name: "Install certbot snap"
when: funkwhwale_nginx_managed and funkwhale_letsencrypt_enabled
become: true
command: snap install --classic certbot
- name: "Link certbot snap installation"
when: funkwhwale_nginx_managed and funkwhale_letsencrypt_enabled
become: true
command: ln -s /snap/bin/certbot /usr/bin/certbot
- name: "Link certbot snap installation"
when: funkwhwale_nginx_managed and funkwhale_letsencrypt_enabled
become: true become: true
command: certbot-auto --install-only -n -v
- name: Create letsencrypt certificate - name: Create letsencrypt certificate
when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and not funkwhale_letsencrypt_skip_cert when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and not funkwhale_letsencrypt_skip_cert
become: true become: true
command: certbot-auto -v -n certonly --nginx -m {{ funkwhale_letsencrypt_email }} --agree-tos -d {{ funkwhale_hostname }} {{ funkwhale_letsencrypt_certbot_flags }} command: certbot -v -n certonly --nginx -m {{ funkwhale_letsencrypt_email }} --agree-tos -d {{ funkwhale_hostname }} {{ funkwhale_letsencrypt_certbot_flags }}
args: args:
creates: /etc/letsencrypt/live/{{ funkwhale_hostname }} creates: /etc/letsencrypt/live/{{ funkwhale_hostname }}
...@@ -40,7 +51,7 @@ ...@@ -40,7 +51,7 @@
cron: cron:
name: funkwhale_letsencrypt_renewal name: funkwhale_letsencrypt_renewal
special_time: weekly special_time: weekly
job: /usr/local/bin/certbot-auto -v -n certonly --nginx -m {{ funkwhale_letsencrypt_email }} --agree-tos -d {{ funkwhale_hostname }} {{ funkwhale_letsencrypt_certbot_flags }} job: /usr/bin/certbot -v -n certonly --nginx -m {{ funkwhale_letsencrypt_email }} --agree-tos -d {{ funkwhale_hostname }} {{ funkwhale_letsencrypt_certbot_flags }}
- name: "Create funkwhale proxy file" - name: "Create funkwhale proxy file"
when: funkwhale_nginx_managed when: funkwhale_nginx_managed
......
...@@ -25,3 +25,4 @@ ...@@ -25,3 +25,4 @@
- "curl" - "curl"
- "dbus" - "dbus"
- "virtualenv" - "virtualenv"
- "snapd"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment