teh/mastodon-deploy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Disabling nginx stuff while we work on the local dev setup

Browse source
This commit is contained in:
Erik Stambaugh 2022-11-07 19:31:28 -08:00
parent c09c919c19
commit 700b4d8b23
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roles/mastodon/files/docker-compose.yaml
View file

@ -66,7 +66,7 @@ services:
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
networks: networks:
- mastodon - mastodon
- nginx # - nginx # XXX <--------- PUT THIS BACK BEFORE PROD
healthcheck: healthcheck:
# prettier-ignore # prettier-ignore
test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1'] test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
@ -90,7 +90,7 @@ services:
command: node ./streaming command: node ./streaming
networks: networks:
- mastodon - mastodon
- nginx # - nginx # XXX <--------- PUT THIS BACK BEFORE PROD
healthcheck: healthcheck:
# prettier-ignore # prettier-ignore
test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:5000/api/v1/streaming/health || exit 1'] test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:5000/api/v1/streaming/health || exit 1']
@ -112,7 +112,7 @@ services:
- mastodon_redis - mastodon_redis
networks: networks:
- mastodon - mastodon
- nginx # - nginx # XXX <--------- PUT THIS BACK BEFORE PROD
volumes: volumes:
- ./public/system:/mastodon/public/system - ./public/system:/mastodon/public/system
healthcheck: healthcheck:
@ -141,6 +141,7 @@ networks:
driver: default driver: default
config: config:
- subnet: 172.42.0.0/16 - subnet: 172.42.0.0/16
nginx: # XXX PUT THIS BACK BEFORE PROD:
external: true # nginx:
# external: true

35
roles/mastodon/tasks/main.yml
View file

@ -2,7 +2,6 @@
# https://docs.joinmastodon.org/admin/config/make # https://docs.joinmastodon.org/admin/config/make
# check out mastodon
- name: check out mastodon - name: check out mastodon
git: git:
repo: ssh://git@git.stoopid.club:2222/teh.entar.net/mastodon.git repo: ssh://git@git.stoopid.club:2222/teh.entar.net/mastodon.git
@ -11,34 +10,34 @@
update: no update: no
register: mastodon_git register: mastodon_git
# copy mastodon docker-compose
- name: masto docker-compose - name: masto docker-compose
copy: copy:
src: files/docker-compose.yaml src: files/docker-compose.yaml
dest: /srv/mastodon/docker-compose.yml dest: /srv/mastodon/docker-compose.yml
register: mastodon_docker_compose register: mastodon_docker_compose
# mastodon env file
- name: masto env - name: masto env
copy: copy:
src: files/mastodon-env src: files/mastodon-env
dest: /srv/mastodon/.env.production dest: /srv/mastodon/.env.production
register: mastodon_env register: mastodon_env
# launch mastodon - name: launch mastodon
command: docker-compose up -d
- name: nginx config args:
copy: chdir: /srv/mastodon
src: files/nginx.conf
dest: /srv/nginx/conf.d/teh.entar.net.conf
owner: netsrv
group: netsrv
mode: "0644"
register: entarnginx
- name: restart nginx
command: docker restart nginx-www
when: entarnginx.changed
# XXX PARAMETERIZE AND PUT BACK THE NGINX STUFF BEFORE PROD:
#- name: nginx config
# copy:
# src: files/nginx.conf
# dest: /srv/nginx/conf.d/teh.entar.net.conf
# owner: netsrv
# group: netsrv
# mode: "0644"
# register: nginx
#
#- name: restart nginx
# command: docker restart nginx-www
# when: nginx.changed