From 3b34ee8ee5817ea3344ac3696d89d436f4fdb145 Mon Sep 17 00:00:00 2001 From: waffles Date: Fri, 24 Feb 2023 00:12:47 -0800 Subject: [PATCH] Move certificates to files/ and use a wildcard certificate --- .gitignore | 6 ++---- roles/frontend/tasks/main.yml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 23eb1fb..3ab4d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ roles/mastodon/vars/main.yml host_vars/ group_vars/ -roles/frontend/templates/cdn.fullchain.pem -roles/frontend/templates/cdn.privkey.pem -roles/frontend/templates/domain.fullchain.pem -roles/frontend/templates/domain.privkey.pem +roles/frontend/files/wildcard.fullchain.pem +roles/frontend/files/wildcard.privkey.pem diff --git a/roles/frontend/tasks/main.yml b/roles/frontend/tasks/main.yml index 316fe16..a8e3084 100644 --- a/roles/frontend/tasks/main.yml +++ b/roles/frontend/tasks/main.yml @@ -67,29 +67,29 @@ - install - name: Install mastodon domain SSL certificate - template: - src: domain.fullchain.pem + copy: + src: wildcard.fullchain.pem dest: /etc/nginx/ssl/domain.fullchain.pem tags: - install - name: Install mastodon domain ssl key - template: - src: domain.privkey.pem + copy: + src: wildcard.privkey.pem dest: /etc/nginx/ssl/domain.privkey.pem tags: - install - name: Install mastodon CDN SSL certificate - template: - src: cdn.fullchain.pem + copy: + src: wildcard.fullchain.pem dest: /etc/nginx/ssl/cdn.fullchain.pem tags: - install - name: Install mastodon CDN ssl key - template: - src: cdn.privkey.pem + copy: + src: wildcard.privkey.pem dest: /etc/nginx/ssl/cdn.privkey.pem tags: - install