th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #56 from MartenBE/docker-added-cron

Browse Source 
Moved DEBUG variable to config
This commit is contained in:
th3r00t
2020-08-09 18:26:38 -04:00
committed by GitHub
parent cf9e5a240a d0fb22dccd
commit c22f42358c
6 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.json
View File

@@ -1 +1 @@
{"TITLE": "pyShelf E-Book Server", "VERSION": "0.6.0", "BOOKPATH": "~/books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "SECRET": ""}
{"TITLE": "pyShelf E-Book Server", "VERSION": "0.6.0", "BOOKPATH": "~/books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "SECRET": "", "BUILD_MODE": "DEBUG"}

2
docker/Dockerfile vendored
View File

@@ -5,7 +5,7 @@
# Use the following commands to build and push the docker image to Dockerhub:
#
# docker build -t pyshelf/pyshelf -f .\docker\Dockerfile .
# docker build -t pyshelf/pyshelf -f ./docker/Dockerfile .
# docker login
# docker push pyshelf/pyshelf

2
docker/development.docker-compose.yml vendored
View File

@@ -6,7 +6,7 @@ version: "3.7"
# For development, use the following command in the root folder:
#
# docker-compose -f .\docker\development.docker-compose.yml up --build
# docker-compose -f ./docker/development.docker-compose.yml up --build
services:
db:

1
requirements.txt
View File

@@ -21,3 +21,4 @@ mobi-python
uwsgi
jsonpickle
django-widget-tweaks
pudb

1
src/backend/lib/config.py
View File

@@ -37,6 +37,7 @@ class Config:
self.db_user = _data["USER"]
self.db_pass = _data["PASSWORD"]
self.SECRET = _data["SECRET"]
self.debug_build_mode = (_data["BUILD_MODE"].casefold() == "debug")
def open_file(self, _cp):
"""

3
src/frontend/settings.py
View File

@@ -32,8 +32,9 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = CONFIG.SECRET
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = TEMPLATE_DEBUG = False
DEBUG = TEMPLATE_DEBUG = CONFIG.debug_build_mode
if DEBUG is True:
print("DEBUG build mode is ON")
from pudb.remote import set_trace
ALLOWED_HOSTS = CONFIG.allowed_hosts