New .env.sample format, extra OIDC vars

.env.sample

@@ -7,15 +7,20 @@ LETS_ENCRYPT_ENV=production
 
 SECRET_DB_PASSWORD_VERSION=v1
 
+COMPOSE_FILE="compose.yml"
+
 # OAuth, see https://hackmd.io/@codimd/codimd-generic-oauth-2
 
-#COMPOSE_FILE="compose.yml:compose.oauth.yml"
+#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_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
 #
 #SECRET_OAUTH_KEY_VERSION=v1
 
@@ -34,4 +39,4 @@ SECRET_DB_PASSWORD_VERSION=v1
 # CMD_CSP_REPORTURI=undefined
 # CMD_DEFAULT_PERMISSION=editable
 # CMD_EMAIL=true
-# CMD_SESSION_LIFE=1209600000
+# CMD_SESSION_LIFE=1209600000

compose.oauth.yml

@@ -12,6 +12,8 @@ services:
       - CMD_OAUTH2_TOKEN_URL
       - CMD_OAUTH2_USER_PROFILE_URL
       - CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
+      - CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
+      - CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
     secrets:
       - oauth_key