From 60d0e9582d0967a5143f269d3794838fdd8d83c6 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 14:43:10 +0000
Subject: [PATCH 1/5] load forest.config

---
 flask/forest/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flask/forest/__init__.py b/flask/forest/__init__.py
index e3f93bf..e3f1f56 100644
--- a/flask/forest/__init__.py
+++ b/flask/forest/__init__.py
@@ -12,7 +12,7 @@ from flask import (
 from flask_sqlalchemy import SQLAlchemy
 
 app = Flask(__name__)
-app.config.from_object("project.config.Config")
+app.config.from_object("forest.config.Config")
 db = SQLAlchemy(app)
 
 

From 71f7f2c7ded6feaaeacfd237e295654ecff34aec Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 14:47:37 +0000
Subject: [PATCH 2/5] add missing pip requierments

---
 flask/requirements.txt | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/flask/requirements.txt b/flask/requirements.txt
index de90336..e6699e7 100644
--- a/flask/requirements.txt
+++ b/flask/requirements.txt
@@ -1,4 +1,18 @@
-Flask==1.1.2
-Flask-SQLAlchemy==2.5.1
-gunicorn==20.1.0
-psycopg2-binary==2.8.6
+gunicorn
+psycopg2-binary
+alembic
+Babel
+Flask
+Flask-SQLAlchemy
+Flask-Admin
+Flask-Babel
+Flask-Bootstrap
+Flask-Login
+Flask-Mail
+Flask-Migrate
+Flask-Moment
+Flask-Uploads
+Flask-WTF
+Jinja2
+PyQRCode
+WTForms

From b559ea4c9f005c03e4f046f5871ee4529117add2 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 15:16:42 +0000
Subject: [PATCH 3/5] disable depricated migratecommand

---
 docker-compose.yml |  2 ++
 flask/manage.py    | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 059c028..85410a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,8 @@ services:
       - "./lb:/usr/local/etc/haproxy"
     depends_on:
       - "certbot"
+      - "flask"
+      - "osmtile"
     restart: always
     networks:
       - internal
diff --git a/flask/manage.py b/flask/manage.py
index 110ed75..85c9a91 100644
--- a/flask/manage.py
+++ b/flask/manage.py
@@ -1,18 +1,16 @@
 #!/usr/bin/env python
 
 import os
-import subprocess, shlex
-from forest import app, db, User
 
 from flask.cli import FlaskGroup
+from forest import app, db, User
+
 from flask_migrate import Migrate
-from flask_migrate import MigrateCommand
 
 cli = FlaskGroup(app)
-migrate = Migrate(app, db)
-
-cli.add_command('db', MigrateCommand)
 
+migrate = Migrate()
+migrate.init_app(app, db)
 
 @cli.command("create_db")
 def create_db():

From 975bb9c9f5c36171766165f0d95eaed72eb59a5a Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 15:33:49 +0000
Subject: [PATCH 4/5] fix the osmtile db path

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 85410a3..f0e5e2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,7 +61,7 @@ services:
       - "DOWNLOAD_PBF=https://download.geofabrik.de/europe/bulgaria-latest.osm.pbf"
       - "DOWNLOAD_POLY=https://download.geofabrik.de/europe/bulgaria.poly"
     volumes:
-      - "./data/osmtile/pgdata:/var/lib/postgresql/data/"
+      - "./data/osmtile/pgdata:/var/lib/postgresql/12/main"
     networks:
       - internal
     #entrypoint: "/run.sh import"

From 830f996d6068222f74a4460d104568313b8d4434 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel@deflax.net>
Date: Fri, 4 Feb 2022 15:46:39 +0000
Subject: [PATCH 5/5] update subdomains

---
 README.md      | 7 ++++---
 lb/haproxy.cfg | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8371291..3fe788d 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Uses the default Flask development server.
 1. Build the images and run the containers:
 
     ```sh
-    $ docker-compose up -d --build
+    $ docker-compose -f docker-compose.dev.yml up -d --build
     ```
 
     Test it out at [http://localhost:5000](http://localhost:5000). The "web" folder is mounted into the container and your code changes apply automatically.
@@ -18,10 +18,11 @@ Uses the default Flask development server.
 Uses gunicorn + nginx.
 
 1. Rename *.env.prod-sample* to *.env.prod* and *.env.prod.db-sample* to *.env.prod.db*. Update the environment variables.
-1. Build the images and run the containers:
+2. run osmtile with import script
+2. Build the images and run the containers:
 
     ```sh
-    $ docker-compose -f docker-compose.prod.yml up -d --build
+    $ docker-compose  up -d --build
     ```
 
     Test it out at [http://localhost:1337](http://localhost:1337). No mounted folders. To apply changes, the image must be re-built.
diff --git a/lb/haproxy.cfg b/lb/haproxy.cfg
index 9b9294c..0ff0172 100644
--- a/lb/haproxy.cfg
+++ b/lb/haproxy.cfg
@@ -59,7 +59,7 @@ frontend https
 
     use_backend %[req.hdr(Host),lower]
 
-backend map.forest.deflax.net
+backend map.deflax.net
     # Get from cache / put in cache
     http-request cache-use mapscache
     http-response cache-store mapscache
@@ -70,7 +70,7 @@ backend forest.deflax.net
     # server list
     server s1 flask:5000 check
 
-#backend swagger.deflax.net
+#backend docs.deflax.net
 #    # server list
 #    server s1 swagger:80 check