tasks/nginx.yml

@@ -14,23 +14,28 @@
     state: started
 
 # 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
   become: true
-  get_url:
-    url: https://dl.eff.org/certbot-auto
-    dest: /usr/local/bin/certbot-auto
-    mode: 0750
+  command: snap install core
   
-- name: "Install certbot using certbot-auto"
+- name: Refresh core snap before installing certbot
   when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
   become: true
-  command: certbot-auto --install-only -n -v
+  command: snap refresh core
+
+- name: Link certbot snap installation
+  when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled
+  become: true
+  file: 
+    src: /snap/bin/certbot
+    dest: /usr/bin/certbot
+    state: link
 
 - name: Create letsencrypt certificate
   when: funkwhale_nginx_managed and funkwhale_letsencrypt_enabled and not funkwhale_letsencrypt_skip_cert
   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:
     creates: /etc/letsencrypt/live/{{ funkwhale_hostname }}
 
@@ -40,7 +45,7 @@
   cron:
     name: funkwhale_letsencrypt_renewal
     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"
   when: funkwhale_nginx_managed

tasks/packages.yml

@@ -25,3 +25,4 @@
       - "curl"
       - "dbus"
       - "virtualenv"
+      - "snapd"