packetcat
/
mastible
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Specify direct path to acme.sh and remove mentions of letsencrypt/certbot

This commit is contained in:
staticsafe 2019-01-12 15:11:22 -05:00
parent cbc66a96a6
commit adcc82103f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/mastodon-nginx/tasks/install.yml
View File

@ -7,6 +7,6 @@
- name: Install acme.sh - name: Install acme.sh
shell: wget -O - https://get.acme.sh | sh shell: wget -O - https://get.acme.sh | sh
- name: Generate certificate using acme.sh - name: Generate certificate using acme.sh
shell: acme.sh --issue --nginx -d {{ LOCAL_DOMAIN }} shell: /root/.acme.sh/acme.sh --issue --nginx -d {{ LOCAL_DOMAIN }}
- name: Install certificate in storage directory - name: Install certificate in storage directory
shell: acme.sh --install-cert -d {{ LOCAL_DOMAIN }} --key-file /etc/ssl/letsencrypt/{{ LOCAL_DOMAIN }}.pem --fullchain-file /etc/ssl/letsencrypt/{{ LOCAL_DOMAIN }}.crt --reloadcmd "service nginx force-reload" shell: /root/.acme.sh/acme.sh --install-cert -d {{ LOCAL_DOMAIN }} --key-file /etc/ssl/letsencrypt/{{ LOCAL_DOMAIN }}.pem --fullchain-file /etc/ssl/letsencrypt/{{ LOCAL_DOMAIN }}.crt --reloadcmd "service nginx force-reload"

8
roles/mastodon-nginx/tasks/main.yml
View File

@ -1,11 +1,10 @@
--- ---
# This role install nginx, configures it # This role install nginx, configures it
- name: Install nginx and certbot - name: Install nginx
apt: name={{ item }} state=latest update_cache=yes apt: name={{ item }} state=latest update_cache=yes
with_items: with_items:
- nginx - nginx
- letsencrypt
- name: Remove default nginx config in sites-enabled - name: Remove default nginx config in sites-enabled
file: file:
path: /etc/nginx/sites-enabled/default path: /etc/nginx/sites-enabled/default
@ -19,11 +18,6 @@
src: /etc/nginx/sites-available/{{ LOCAL_DOMAIN }}.conf src: /etc/nginx/sites-available/{{ LOCAL_DOMAIN }}.conf
dest: /etc/nginx/sites-enabled/{{ LOCAL_DOMAIN }}.conf dest: /etc/nginx/sites-enabled/{{ LOCAL_DOMAIN }}.conf
state: link state: link
- name: Copy and enable Let's Encrypt renew script
copy:
src: letsencrypt-renew.sh
dest: /etc/cron.daily/letsencrypt-renew.sh
mode: 0700
- name: Run nginx install tasks - name: Run nginx install tasks
include_tasks: install.yml include_tasks: install.yml
when: install is defined when: install is defined