restructure

.gitignore

@@ -77,22 +77,4 @@ mediafiles/
 staticfiles/
 postgresql/
 
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
 

.idea/recipes.iml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="django" name="Django">
+      <configuration>
+        <option name="rootFolder" value="$MODULE_DIR$" />
+        <option name="settingsModule" value="recipes/settings.py" />
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.7 (recipes)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jquery-3.4.1" level="application" />
+    <orderEntry type="library" name="pretty-checkbox" level="application" />
+    <orderEntry type="library" name="pdf" level="application" />
+    <orderEntry type="library" name="pdf_viewer" level="application" />
+  </component>
+  <component name="TemplatesService">
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
+    <option name="TEMPLATE_FOLDERS">
+      <list>
+        <option value="$MODULE_DIR$/templates" />
+        <option value="$MODULE_DIR$/cookbook/templates" />
+      </list>
+    </option>
+  </component>
+</module>

README.md

@@ -1,7 +1,7 @@
 # Recipes ![Continous Integration](https://github.com/vabene1111/recipes/workflows/Continous%20Integration/badge.svg?branch=develop)
 Recipes is a Django application to manage, tag and search recipes using either built in models or external storage providers hosting PDF's, Images or other files.
 
-![Preview](preview.png)
+![Preview](docs/preview.png)
 
 ### Features
 

docs/docker/nginx-proxy/docker-compose.yml

@@ -0,0 +1,43 @@
+version: "3"
+services:
+  db_recipes:
+    restart: always
+    image: "postgres:11-alpine"
+    volumes:
+    - ./postgresql:/var/lib/postgresql/data
+    env_file:
+    - ./.env
+    networks:
+    - default
+
+  web_recipes:
+    build: .
+    restart: always
+    env_file:
+    - ./.env
+    command: "gunicorn --bind 0.0.0.0:8080 recipes.wsgi"
+    volumes:
+    - .:/Recipes
+    depends_on:
+    - db_recipes
+    networks:
+    - default
+
+  nginx_recipes:
+    image: "nginx"
+    restart: always
+    env_file:
+    - ./.env
+    volumes:
+    - ./nginx/conf.d:/etc/nginx/conf.d
+    - ./staticfiles:/static
+    - ./mediafiles:/media
+    networks:
+    - default
+    - nginx-proxy
+
+networks:
+  default:
+  nginx-proxy:
+    external:
+      name: nginx-proxy

docs/docker/plain/docker-compose.yml

@@ -0,0 +1,40 @@
+version: "3"
+services:
+  db_recipes:
+    restart: always
+    image: "postgres:11-alpine"
+    volumes:
+    - ./postgresql:/var/lib/postgresql/data
+    env_file:
+    - ./.env
+    networks:
+    - default
+
+  web_recipes:
+    build: .
+    restart: always
+    env_file:
+    - ./.env
+    command: "gunicorn --bind 0.0.0.0:8080 recipes.wsgi"
+    volumes:
+    - .:/Recipes
+    depends_on:
+    - db_recipes
+    networks:
+    - default
+
+  nginx_recipes:
+    image: "nginx"
+    restart: always
+    env_file:
+    - ./.env
+    volumes:
+    - ./nginx/conf.d:/etc/nginx/conf.d
+    - ./staticfiles:/static
+    - ./mediafiles:/media
+    ports:
+    - 80:80
+    networks:
+    - default
+    depends_on:
+    - web_recipes

docs/docker/traefik/README.md

@@ -0,0 +1,60 @@
+Please refer to the traefik documentation on how to setup a docker service in traefik. Since treafik can be a little
+confusing at times, the following are examples of my traefik configuration.
+
+
+You need to create a network called `traefik` using `docker network create traefik`.
+## docker-compose.yml
+
+```
+version: "3.3"
+
+services:
+
+  traefik:
+    image: "traefik:v2.1"
+    container_name: "traefik"
+    ports:
+      - "443:443"
+      - "80:80"
+      - "8080:8080"
+    volumes:
+      - "./letsencrypt:/letsencrypt"
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "./config:/etc/traefik/"
+
+
+networks:
+    default:
+       external:
+         name: traefik
+```
+
+## traefik.toml
+Place this in a directory called `config` as this is mounted into the traefik container (see docer compose).
+**Change the email address accordingly**.
+```
+[api]
+  insecure=true
+
+[providers.docker]
+  endpoint = "unix:///var/run/docker.sock"
+  exposedByDefault = false
+  network = "traefik"
+
+#[log]
+#  level = "DEBUG"
+
+[entryPoints]
+  [entryPoints.web]
+    address = ":80"
+
+  [entryPoints.web_secure]
+    address = ":443"
+
+[certificatesResolvers.le_resolver.acme]
+
+  email = "you_email@mail.com"
+  storage = "/letsencrypt/acme.json"
+
+  tlsChallenge=true
+```

docs/docker/traefik/docker-compose.yml

@@ -0,0 +1,40 @@
+version: "3"
+services:
+  db_recipes:
+    restart: always
+    image: "postgres:11-alpine"
+    volumes:
+    - ./postgresql:/var/lib/postgresql/data
+    env_file:
+    - ./.env
+
+  web_recipes:
+    build: .
+    restart: always
+    env_file:
+    - ./.env
+    command: "gunicorn --bind 0.0.0.0:8080 recipes.wsgi"
+    volumes:
+    - .:/Recipes
+    depends_on:
+    - db_recipes
+
+  nginx_recipes:
+    image: "nginx"
+    restart: always
+    env_file:
+    - ./.env
+    volumes:
+    - ./nginx/conf.d:/etc/nginx/conf.d
+    - ./staticfiles:/static
+    - ./mediafiles:/media
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.recipes.rule=Host(`recipes.mydomain.com`) || Host(`recipes.myotherdomain.com`)"
+      - "traefik.http.routers.recipes.entrypoints=web_secure"
+      - "traefik.http.routers.recipes.tls.certresolver=le_resolver"
+
+networks:
+    default:
+       external:
+         name: traefik