From b2823864194d0bbdea265dee573de12714250f95 Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Tue, 5 Jul 2022 16:50:01 +0200
Subject: [PATCH] update oauth envs

---
 .env.sample       | 13 +++++++------
 compose.oauth.yml |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env.sample b/.env.sample
index 3a784b6..461c30b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,26 +1,27 @@
-TYPE=codimd
+TYPE=hedgedoc
 
-DOMAIN=codimd.example.com
+DOMAIN=hedgedoc.example.com
 ## Domain aliases
-#EXTRA_DOMAINS=', `www.codimd.example.com`'
+#EXTRA_DOMAINS=', `www.hedgedoc.example.com`'
 LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
 
 COMPOSE_FILE="compose.yml"
 
-# OAuth, see https://hackmd.io/@codimd/codimd-generic-oauth-2
+# OAuth, see https://docs.hedgedoc.org/guides/auth/keycloak/
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
 #CMD_OAUTH2_PROVIDERNAME="Keycloak"
-#CMD_OAUTH2_BASEURL="https://keycloak.example.com/realms/realmname/protocol/openid-connect/"
-#CMD_OAUTH2_CLIENT_ID="codimd"
+#CMD_OAUTH2_CLIENT_ID="hedgedoc"
 #CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
 #CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
 #CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
 #CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
 #CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
 #CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
+#CMD_OAUTH2_PROVIDERNAME=Keycloak
+#CMD_OAUTH2_SCOPE="openid email profile"
 #
 #SECRET_OAUTH_KEY_VERSION=v1
 
diff --git a/compose.oauth.yml b/compose.oauth.yml
index e915d11..9774094 100644
--- a/compose.oauth.yml
+++ b/compose.oauth.yml
@@ -5,7 +5,6 @@ services:
   app:
     environment:
       - CMD_OAUTH2_PROVIDERNAME
-      - CMD_OAUTH2_BASEURL
       - CMD_OAUTH2_CLIENT_ID
       - CMD_OAUTH2_CLIENT_SECRET_FILE=/run/secrets/oauth_key
       - CMD_OAUTH2_AUTHORIZATION_URL
@@ -14,6 +13,7 @@ services:
       - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
       - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
       - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
+      - CMD_OAUTH2_SCOPE
     secrets:
       - oauth_key