From 23246cccae09979665f2363375053d746500dcfa Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 20 Aug 2020 16:00:38 +0200
Subject: [PATCH] services: remove Recipes

---
 docker-compose.yml                            | 28 ----------
 .../nginx/proxy-confs/recipes.subdomain.conf  | 53 -------------------
 recipes/recipes.env                           | 34 ------------
 3 files changed, 115 deletions(-)
 delete mode 100644 letsencrypt/nginx/proxy-confs/recipes.subdomain.conf
 delete mode 100644 recipes/recipes.env

diff --git a/docker-compose.yml b/docker-compose.yml
index 369e41c..1b4d32d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,9 +11,6 @@ services:
       - ./letsencrypt/letsencrypt.env
     volumes:
       - ./letsencrypt:/config
-      # Recipe media should not be served by GUnicorn, don't want to setup Nginx
-      - ./recipes/mediafiles:/opt/recipes/media
-      - ./recipes/staticfiles:/opt/recipes/static
     ports:
       - 80:80
       - 443:443
@@ -360,31 +357,6 @@ services:
       - ./riot/config.json:/app/config.json
     expose:
       - 80
-    ports:
-      - 8080:80
-
-  recipes:
-    image: vabene1111/recipes
-    restart: unless-stopped
-    container_name: recipes
-    env_file:
-      - ./recipes/recipes.env
-      - ./recipes/recipes.env.secret
-    volumes:
-      - ./recipes/staticfiles:/opt/recipes/staticfiles
-      - ./recipes/mediafiles:/opt/recipes/mediafiles
-    depends_on:
-      - recipes_db
-
-  recipes_db:
-    image: postgres:11-alpine
-    restart: unless-stopped
-    container_name: recipes_db
-    volumes:
-      - ./recipes/postgresql:/var/lib/postgresql/data
-    env_file:
-      - ./recipes/recipes.env
-      - ./recipes/recipes.env.secret
 
   jupyter:
     image: jupyter/datascience-notebook:lab-2.1.5
diff --git a/letsencrypt/nginx/proxy-confs/recipes.subdomain.conf b/letsencrypt/nginx/proxy-confs/recipes.subdomain.conf
deleted file mode 100644
index 5a6dc48..0000000
--- a/letsencrypt/nginx/proxy-confs/recipes.subdomain.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# make sure that your dns has a cname set for adguard and that your adguard container is named adguard
-
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-
-    server_name recipes.*;
-
-    include /config/nginx/ssl.conf;
-
-    client_max_body_size 0;
-
-    # enable for ldap auth, fill in ldap details in ldap.conf
-    #include /config/nginx/ldap.conf;
-
-    # enable for Authelia
-    include /config/nginx/authelia-server.conf;
-
-    location / {
-        # enable the next two lines for http auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        # enable the next two lines for ldap auth
-        #auth_request /auth;
-        #error_page 401 =200 /ldaplogin;
-
-        # enable for Authelia
-        include /config/nginx/authelia-location.conf;
-
-        include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app recipes;
-        set $upstream_port 8080;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-    }
-
-    location /static/ {
-        alias /opt/recipes/static/;
-    }
-
-    location /media/ {
-        alias /opt/recipes/media/;
-    }
-
-    # Required to allow user to logout of authentication from within Recipes
-    # Ensure the <auth_endpoint> below is changed to actual the authentication url
-    location /accounts/logout/ {
-        return 301 https://auth.belanyi.fr/logout;
-    }
-}
diff --git a/recipes/recipes.env b/recipes/recipes.env
deleted file mode 100644
index f0cca7f..0000000
--- a/recipes/recipes.env
+++ /dev/null
@@ -1,34 +0,0 @@
-# only set this to true when testing/debugging
-# when unset: 1 (true) - dont unset this, just for development
-DEBUG=0
-
-# hosts the application can run under e.g. recipes.mydomain.com,cooking.mydomain.com,...
-ALLOWED_HOSTS=*
-
-# random secret key, use for example base64 /dev/urandom | head -c50 to generate one
-#SECRET_KEY=FIXME-CHANGE-THIS
-
-# add only a database password if you want to run with the default postgres, otherwise change settings accordingly
-DB_ENGINE=django.db.backends.postgresql_psycopg2
-POSTGRES_HOST=recipes_db
-POSTGRES_PORT=5432
-POSTGRES_USER=djangodb
-#POSTGRES_PASSWORD=FIXME-CHANGE-THIS
-POSTGRES_DB=djangodb
-
-# Serve mediafiles directly using gunicorn. Basically everyone recommends not doing this. Please use any of the examples
-# provided that include an additional nxginx container to handle media file serving.
-# If you know what you are doing turn this back on (1) to serve media files using djangos serve() method.
-# when unset: 1 (true) - this is temporary until an appropriate amount of time has passed for everyone to migrate
-GUNICORN_MEDIA=0
-
-
-# allow authentication via reverse proxy (e.g. authelia), leave of if you dont know what you are doing
-# docs: https://github.com/vabene1111/recipes/tree/develop/docs/docker/nginx-proxy%20with%20proxy%20authentication
-# when unset: 0 (false)
-REVERSE_PROXY_AUTH=1
-
-
-# the default value for the user preference 'comments' (enable/disable commenting system)
-# when unset: 1 (true)
-COMMENT_PREF_DEFAULT=1