erik/masto-aio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Get certbot to work and make mastodon serve without conflict

Browse source
This commit is contained in:
Erik Stambaugh 2024-01-21 08:02:49 -08:00
parent fe897152f5
commit 716d0f1dc8
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ansible/roles/certbot/templates/docker-compose.yaml
View file

@ -9,8 +9,7 @@ services:
- /srv/certbot/www:/var/www/certbot - /srv/certbot/www:/var/www/certbot
entrypoint: > entrypoint: >
/bin/sh -c 'trap exit TERM; /bin/sh -c 'trap exit TERM;
certbot certonly --noninteractive --register-unsafely-without-email --agree-tos --reinstall --cert-name {{domain_name}} -d {{domain_name}} --webroot --webroot-path=/var/www/certbot while :; do certbot renew --noninteractive --webroot --webroot-path=/var/www/certbot --cert-name {{domain_name}}
; while :; do certbot renew --noninteractive --webroot --webroot-path=/var/www/certbot --cert-name {{domain_name}}
; sleep 12h & wait $${!}; done;' ; sleep 12h & wait $${!}; done;'
networks: networks:
- nginx - nginx

1
ansible/roles/mastodon/tasks/main.yaml
View file

@ -17,6 +17,7 @@
git: git:
repo: "https://tea.entar.net/teh/mastodon.git" repo: "https://tea.entar.net/teh/mastodon.git"
dest: /srv/mastodon/src dest: /srv/mastodon/src
version: deploy
- name: docker-compose file - name: docker-compose file
template: template:

7
ansible/roles/nginx/templates/nginx.conf
View file

@ -9,7 +9,7 @@ http {
charset utf-8; charset utf-8;
server { server {
listen 80; listen 80;
server_name {{domain_name}}; server_name {{domain_name}}_base;
server_tokens off; server_tokens off;
location /.well-known/acme-challenge/ { location /.well-known/acme-challenge/ {
@ -28,7 +28,7 @@ http {
listen 443 ssl default_server; listen 443 ssl default_server;
server_name {{domain_name}}; server_name {{domain_name}}_base;
root /usr/share/nginx/html; root /usr/share/nginx/html;
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
@ -37,7 +37,6 @@ http {
ssl_certificate_key /etc/letsencrypt/live/{{domain_name}}/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/{{domain_name}}/privkey.pem;
include /etc/letsencrypt/options-ssl-nginx.conf; include /etc/letsencrypt/options-ssl-nginx.conf;
# ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
location / { location / {
try_files $uri $uri/ /index.html; try_files $uri $uri/ /index.html;
@ -71,3 +70,5 @@ http {
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
} }