From 333ee3eed4469cbff586c1c7a2a6e7db57a3fd05 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Sat, 16 May 2020 20:39:38 +0200 Subject: [PATCH] dc: fix compose, remove SESSION_COOKIE_DOMAIN --- README.md | 2 +- docker-compose.yml | 2 +- passbook/lib/management/commands/bootstrap.py | 4 ---- passbook/root/settings.py | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6a6777e40..d35b8f589 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## Quick instance ``` -export PASSBOOK_DOMAIN=domain.tld +export PASSBOOK_DOMAIN=localhost # Optionally enable Error-reporting # export PASSBOOK_ERROR_REPORTING=true docker-compose pull diff --git a/docker-compose.yml b/docker-compose.yml index ff248cb4f..e6d47df3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,7 @@ services: - internal labels: - traefik.frontend.rule=PathPrefix:/static, /robots.txt - - traefik.port=8080 + - traefik.port=80 - traefik.docker.network=internal traefik: image: traefik:1.7 diff --git a/passbook/lib/management/commands/bootstrap.py b/passbook/lib/management/commands/bootstrap.py index 30bd046aa..2d7acbbdc 100644 --- a/passbook/lib/management/commands/bootstrap.py +++ b/passbook/lib/management/commands/bootstrap.py @@ -1,5 +1,4 @@ """passbook management command to bootstrap""" -from argparse import REMAINDER from sys import exit as _exit from time import sleep @@ -20,9 +19,6 @@ class Command(BaseCommand): help = """Bootstrap passbook, ensure Database and Cache are reachable, and directories are writeable""" - def add_arguments(self, parser): - parser.add_argument("command", nargs=REMAINDER) - def check_database(self) -> bool: """Return true if database is reachable, false otherwise""" try: diff --git a/passbook/root/settings.py b/passbook/root/settings.py index 9539d72e5..b889c9366 100644 --- a/passbook/root/settings.py +++ b/passbook/root/settings.py @@ -54,8 +54,6 @@ CSRF_COOKIE_NAME = f"passbook_csrf{_cookie_suffix}" LANGUAGE_COOKIE_NAME = f"passbook_language{_cookie_suffix}" SESSION_COOKIE_NAME = f"passbook_session{_cookie_suffix}" -SESSION_COOKIE_DOMAIN = CONFIG.y("domain", None) - AUTHENTICATION_BACKENDS = [ "django.contrib.auth.backends.ModelBackend", "guardian.backends.ObjectPermissionBackend",