From b8040cd0dc64d66f3ea32da58ee33612d579a1f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 16 Oct 2020 13:02:58 -0700
Subject: [PATCH] Move prod config files to prod branch

---
 docker-compose.yml      |  5 +--
 nginx/default.conf      | 43 ------------------------
 prod-docker-compose.yml | 74 -----------------------------------------
 3 files changed, 1 insertion(+), 121 deletions(-)
 delete mode 100644 prod-docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index d7c4ec3b9..f5391d421 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,6 @@ services:
             - media_volume:/app/images
     db:
         image: postgres
-        env_file: .env
         volumes:
           - pgdata:/var/lib/postgresql/data
         networks:
@@ -36,14 +35,12 @@ services:
             - 8000:8000
     redis:
         image: redis
-        env_file: .env
         ports:
-          - "6379:6379"
+          - 6379:6379
         networks:
             - main
         restart: on-failure
     celery_worker:
-        env_file: .env
         build: .
         networks:
             - main
diff --git a/nginx/default.conf b/nginx/default.conf
index 51165243b..d38982870 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -20,46 +20,3 @@ server {
         alias /app/static/;
     }
 }
-
-# PROD version
-#
-#server {
-#    listen [::]:80;
-#    listen 80;
-#
-#    server_name your-domain.com www.your-domain.com;
-#
-#    location ~ /.well-known/acme-challenge {
-#        allow all;
-#        root /var/www/certbot;
-#    }
-#
-#    # redirect http to https www
-#    return 301 https://www.your-domain.com$request_uri;
-#}
-#
-#server {
-#    listen [::]:443 ssl http2;
-#    listen 443 ssl http2;
-#
-#    server_name your-domain.com;
-#
-#    # SSL code
-#    ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
-#    ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
-#
-#    location / {
-#        proxy_pass http://web;
-#        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#        proxy_set_header Host $host;
-#        proxy_redirect off;
-#    }
-#
-#    location /images/ {
-#        alias /app/images/;
-#    }
-#
-#    location /static/ {
-#        alias /app/static/;
-#    }
-#}
diff --git a/prod-docker-compose.yml b/prod-docker-compose.yml
deleted file mode 100644
index 0ace0df0a..000000000
--- a/prod-docker-compose.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-version: '3'
-
-services:
-    nginx:
-        image: nginx:latest
-        ports:
-            - 80:80
-            - 443:443
-        depends_on:
-            - web
-        networks:
-            - main
-        volumes:
-            - ./nginx:/etc/nginx/conf.d
-            - ./certbot/conf:/etc/nginx/ssl
-            - ./certbot/data:/var/www/certbot
-            - static_volume:/app/static
-            - media_volume:/app/images
-    certbot:
-        image: certbot/certbot:latest
-        command: certonly --webroot --webroot-path=/var/www/certbot --email your-email@domain.com --agree-tos --no-eff-email -d your-domain.com -d www.your-domain.com
-        volumes:
-            - ./certbot/conf:/etc/letsencrypt
-            - ./certbot/logs:/var/log/letsencrypt
-            - ./certbot/data:/var/www/certbot
-    db:
-        image: postgres
-        env_file: .env
-        volumes:
-          - pgdata:/var/lib/postgresql/data
-        networks:
-            - main
-    web:
-        build: .
-        command: python manage.py runserver 0.0.0.0:8000
-        volumes:
-            - .:/app
-            - static_volume:/app/static
-            - media_volume:/app/images
-        depends_on:
-            - db
-            - celery_worker
-        networks:
-            - main
-        ports:
-            - 8000:8000
-    redis:
-        image: redis
-        env_file: .env
-        ports:
-          - "6379:6379"
-        networks:
-            - main
-        restart: on-failure
-    celery_worker:
-        env_file: .env
-        build: .
-        networks:
-            - main
-        command: celery -A celerywyrm worker -l info
-        volumes:
-            - .:/app
-            - static_volume:/app/static
-            - media_volume:/app/images
-        depends_on:
-            - db
-            - redis
-        restart: on-failure
-volumes:
-    pgdata:
-    static_volume:
-    media_volume:
-networks:
-    main: