diff --git a/README.md b/README.md index 0559afc..b08291d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +apt install jq docker-compose ``` cd keycloak diff --git a/env.production b/env.production index 7a1f328..8e6cab5 100644 --- a/env.production +++ b/env.production @@ -1,7 +1,7 @@ -DOMAIN_NAME=example.com -REALM=spacestation +DOMAIN_NAME=hackerspace.zone +REALM=hackerspace -KEYCLOAK_HOSTNAME=login.example.com -HEDGEDOC_HOSTNAME=docs.example.com -MASTODON_HOSTNAME=social.example.com -NEXTCLOUD_HOSTNAME=cloud.example.com +KEYCLOAK_HOSTNAME=login.hackerspace.zone +HEDGEDOC_HOSTNAME=docs.hackerspace.zone +MASTODON_HOSTNAME=social.hackerspace.zone +NEXTCLOUD_HOSTNAME=cloud.hackerspace.zone diff --git a/hedgedoc/docker-compose.yaml b/hedgedoc/docker-compose.yaml index 88c33d0..43d6c58 100644 --- a/hedgedoc/docker-compose.yaml +++ b/hedgedoc/docker-compose.yaml @@ -9,7 +9,7 @@ services: volumes: - ./data/database:/var/lib/postgresql/data restart: always - app: + hedgedoc: # Make sure to use the latest release from https://hedgedoc.org/latest-release image: quay.io/hedgedoc/hedgedoc:1.9.3 env_file: @@ -17,14 +17,14 @@ services: - env.production environment: - CMD_DB_URL=postgres://hedgedoc:password@database:5432/hedgedoc - - CMD_DOMAIN=docs.example.com - #- CMD_URL_ADDPORT=true - - CMD_OAUTH2_USER_PROFILE_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/userinfo + - CMD_PROTOCOL_USESSL=true + - CMD_DOMAIN=docs.hackerspace.zone + - CMD_OAUTH2_AUTHORIZATION_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/auth + - CMD_OAUTH2_TOKEN_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/token + - CMD_OAUTH2_USER_PROFILE_URL=https://login.hackerspace.zone/realms/hackerspace/protocol/openid-connect/userinfo - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=preferred_username - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=name - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=email - - CMD_OAUTH2_TOKEN_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/token - - CMD_OAUTH2_AUTHORIZATION_URL=https://login.example.com/realms/spacestation/protocol/openid-connect/auth - CMD_OAUTH2_CLIENT_ID=hedgedoc - CMD_OAUTH2_PROVIDERNAME=Keycloak volumes: diff --git a/keycloak/README.md b/keycloak/README.md index dddc739..9961d99 100644 --- a/keycloak/README.md +++ b/keycloak/README.md @@ -66,7 +66,7 @@ sudo docker-compose exec -T keycloak \ -r spacestation \ -f - <