diff --git a/ReadMe.md b/ReadMe.md new file mode 100644 index 0000000..e68b8b3 --- /dev/null +++ b/ReadMe.md @@ -0,0 +1,5 @@ +===== Joplin Server ===== + +default Login beim ersten Start: + +admin@localhost - admin diff --git a/docker-compose.yml b/docker-compose.yml index dc7e763..cde7c79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,18 +24,14 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - - - "traefik.http.routers.joplin.entrypoints=http" + - "traefik.http.routers.joplin.rule=Host(`notes.local.zernis.ch`)" - - "traefik.http.middlewares.joplin-https-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.joplin.middlewares=joplin-https-redirect" - - "traefik.http.routers.joplin-secure.entrypoints=https" - - "traefik.http.routers.joplin-secure.rule=Host(`notes.local.zernis.ch`)" - - "traefik.http.routers.joplin-secure.tls=true" - - "traefik.http.routers.joplin-secure.service=gitea" - - "traefik.http.services.joplin.loadbalancer.server.port=22300" - # - 'traefik.http.routers.joplin-secure.middlewares=authelia@docker' - + - "traefik.http.routers.joplin.entrypoints=https" + - "traefik.http.routers.joplin.tls=true" + - "traefik.http.middlewares.sslheader.headers.customrequestheaders.X-Forwarded-Proto = http" + - "traefik.http.routers.joplin.service=joplin-server" + - "traefik.http.services.joplin-server.loadbalancer.passhostheader=true" + - "traefik.http.services.joplin-server.loadbalancer.server.port=22300" db: image: postgres:13 @@ -48,6 +44,8 @@ services: - POSTGRES_PASSWORD=${DB_PASS} - POSTGRES_USER=${DB_USER} - POSTGRES_DB=${DB_NAME} + ports: + - "5432:5432" networks: proxy: