diff --git a/.env.tpl b/.env.tpl index ef34c172..fc3649ed 100644 --- a/.env.tpl +++ b/.env.tpl @@ -44,6 +44,10 @@ SERVER_NAME= # HINT: Set to true if you redirect http to https # SESSION_COOKIE_SECURE= +# CHOOSE ONE: False, True +# DEFAULT: False +TEMPLATES_AUTO_RELOAD=True + ################################################################################ # Flask-Login # @@ -115,6 +119,10 @@ NOPAQUE_ADMIN= # DEFAULT: True # NOPAQUE_DAEMON_ENABLED= +# NOTE: Get these from the nopaque development team +NOPAQUE_DOCKER_REGISTRY_USERNAME=gitlab+deploy-token-30 +NOPAQUE_DOCKER_REGISTRY_PASSWORD=ADXPaYYz7U1gxkUP4X4Y + # transport://[userid:password]@hostname[:port]/[virtual_host] NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI= diff --git a/config.py b/config.py index b922cd64..ec143c03 100644 --- a/config.py +++ b/config.py @@ -10,16 +10,14 @@ load_dotenv(os.path.join(basedir, '.env')) class Config: - ''' # Docker # ''' - DOCKER_REGISTRY = 'gitlab.ub.uni-bielefeld.de:4567' - DOCKER_IMAGE_PREFIX = DOCKER_REGISTRY + '/sfb1288inf/' - ''' # Flask # ''' PREFERRED_URL_SCHEME = os.environ.get('PREFERRED_URL_SCHEME', 'http') SECRET_KEY = os.environ.get('SECRET_KEY', 'hard to guess string') SERVER_NAME = os.environ.get('SERVER_NAME') SESSION_COOKIE_SECURE = \ os.environ.get('SESSION_COOKIE_SECURE', 'false').lower() == 'true' + TEMPLATES_AUTO_RELOAD = \ + os.environ.get('TEMPLATES_AUTO_RELOAD', 'false').lower() == 'true' ''' # Flask-Login # ''' REMEMBER_COOKIE_HTTPONLY = True @@ -49,6 +47,12 @@ class Config: NOPAQUE_DAEMON_ENABLED = \ os.environ.get('NOPAQUE_DAEMON_ENABLED', 'true').lower() == 'true' NOPAQUE_DATA_DIR = os.environ.get('NOPAQUE_DATA_DIR', '/mnt/nopaque') + NOPAQUE_DOCKER_REGISTRY = 'gitlab.ub.uni-bielefeld.de:4567' + NOPAQUE_DOCKER_IMAGE_PREFIX = f'{NOPAQUE_DOCKER_REGISTRY}/sfb1288inf/' + NOPAQUE_DOCKER_REGISTRY_USERNAME = \ + os.environ.get('NOPAQUE_DOCKER_REGISTRY_USERNAME') + NOPAQUE_DOCKER_REGISTRY_PASSWORD = \ + os.environ.get('NOPAQUE_DOCKER_REGISTRY_PASSWORD') NOPAQUE_MAIL_SUBJECT_PREFIX = '[nopaque]' NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI = \ os.environ.get('NOPAQUE_SOCKETIO_MESSAGE_QUEUE_URI')