dc: fix compose, remove SESSION_COOKIE_DOMAIN

This commit is contained in:
Jens Langhammer 2020-05-16 20:39:38 +02:00
parent e68352b09c
commit 333ee3eed4
4 changed files with 2 additions and 8 deletions

View File

@ -8,7 +8,7 @@
## Quick instance ## Quick instance
``` ```
export PASSBOOK_DOMAIN=domain.tld export PASSBOOK_DOMAIN=localhost
# Optionally enable Error-reporting # Optionally enable Error-reporting
# export PASSBOOK_ERROR_REPORTING=true # export PASSBOOK_ERROR_REPORTING=true
docker-compose pull docker-compose pull

View File

@ -65,7 +65,7 @@ services:
- internal - internal
labels: labels:
- traefik.frontend.rule=PathPrefix:/static, /robots.txt - traefik.frontend.rule=PathPrefix:/static, /robots.txt
- traefik.port=8080 - traefik.port=80
- traefik.docker.network=internal - traefik.docker.network=internal
traefik: traefik:
image: traefik:1.7 image: traefik:1.7

View File

@ -1,5 +1,4 @@
"""passbook management command to bootstrap""" """passbook management command to bootstrap"""
from argparse import REMAINDER
from sys import exit as _exit from sys import exit as _exit
from time import sleep from time import sleep
@ -20,9 +19,6 @@ class Command(BaseCommand):
help = """Bootstrap passbook, ensure Database and Cache are help = """Bootstrap passbook, ensure Database and Cache are
reachable, and directories are writeable""" reachable, and directories are writeable"""
def add_arguments(self, parser):
parser.add_argument("command", nargs=REMAINDER)
def check_database(self) -> bool: def check_database(self) -> bool:
"""Return true if database is reachable, false otherwise""" """Return true if database is reachable, false otherwise"""
try: try:

View File

@ -54,8 +54,6 @@ CSRF_COOKIE_NAME = f"passbook_csrf{_cookie_suffix}"
LANGUAGE_COOKIE_NAME = f"passbook_language{_cookie_suffix}" LANGUAGE_COOKIE_NAME = f"passbook_language{_cookie_suffix}"
SESSION_COOKIE_NAME = f"passbook_session{_cookie_suffix}" SESSION_COOKIE_NAME = f"passbook_session{_cookie_suffix}"
SESSION_COOKIE_DOMAIN = CONFIG.y("domain", None)
AUTHENTICATION_BACKENDS = [ AUTHENTICATION_BACKENDS = [
"django.contrib.auth.backends.ModelBackend", "django.contrib.auth.backends.ModelBackend",
"guardian.backends.ObjectPermissionBackend", "guardian.backends.ObjectPermissionBackend",