Disabling nginx stuff while we work on the local dev setup

roles/mastodon/files/docker-compose.yaml

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

roles/mastodon/tasks/main.yml

@@ -2,7 +2,6 @@
 
 # https://docs.joinmastodon.org/admin/config/make
 
-# check out mastodon
 - name: check out mastodon
   git:
     repo: ssh://git@git.stoopid.club:2222/teh.entar.net/mastodon.git
@@ -11,34 +10,34 @@
     update: no
   register: mastodon_git
 
-# copy mastodon docker-compose
 - name: masto docker-compose
   copy:
     src: files/docker-compose.yaml
     dest: /srv/mastodon/docker-compose.yml
   register: mastodon_docker_compose
 
-# mastodon env file
 - name: masto env
   copy:
     src: files/mastodon-env
     dest: /srv/mastodon/.env.production
   register: mastodon_env
 
-# launch mastodon
-
-- name: nginx config
-  copy:
-    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
-
+- name: launch mastodon
+  command: docker-compose up -d
+  args:
+    chdir: /srv/mastodon
 
+# 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