foo

.env.sample

@@ -1,5 +1,4 @@
 TYPE=wekan
-SECRET_SSO_ID_VERSION=v1
 SECRET_SSO_SECRET_VERSION=v1
 
 MONGO_URL=mongodb://db:27017/wekan
@@ -10,7 +9,7 @@ ROOT_URL=https://board.example.com
 DEBUG=false
 OAUTH2_ENABLED=true
 OAUTH2_LOGIN_STYLE=redirect
-OAUTH2_CLIENT_ID=secret
+OAUTH2_CLIENT_ID=wekan
 OAUTH2_SERVER_URL=https://sso.example.com
 OAUTH2_AUTH_ENDPOINT=/application/o/authorize/
 OAUTH2_USERINFO_ENDPOINT=/application/o/userinfo/
@@ -30,4 +29,4 @@ MAIL_URL=smtp://smtp:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
 MAIL_FROM="[SKA] Wekan Notifications"
 
 WITH_API=true
-RICHER_CARD_COMMENT_EDITOR=false
+RICHER_CARD_COMMENT_EDITOR=false

compose.yml

@@ -28,11 +28,11 @@ services:
       - OAUTH2_ENABLED
       - OAUTH2_LOGIN_STYLE
       - OAUTH2_CLIENT_ID
+      - OAUTH2_SECRET
       - OAUTH2_SERVER_URL
       - OAUTH2_AUTH_ENDPOINT
       - OAUTH2_USERINFO_ENDPOINT
       - OAUTH2_TOKEN_ENDPOINT
-      - OAUTH2_SECRET
       - OAUTH2_REQUEST_PERMISSIONS
       - OAUTH2_ID_MAP
       - OAUTH2_USERNAME_MAP
@@ -55,18 +55,10 @@ services:
       timeout: 10s
       retries: 10
       start_period: 1m
-    secrets:
-      - sso_id
-      - sso_secret
     configs:
       - source: healthcheck_js
         target: /build/healthcheck.js
         mode: 0555
-      - source: entrypoint
-        target: /custom-entrypoint.sh
-        mode: 0555
-      
-    entrypoint: /custom-entrypoint.sh
     deploy:
       update_config:
         failure_action: rollback
@@ -103,15 +95,6 @@ services:
   #   networks:
   #     - backend
 
-secrets:
-  sso_id:
-    external: true
-    name: ${STACK_NAME}_sso_id_${SECRET_SSO_ID_VERSION}
-  sso_secret:
-    external: true
-    name: ${STACK_NAME}_sso_secret_${SECRET_SSO_SECRET_VERSION}
-
-
 volumes:
   wekan-db:
   wekan-db-dump:
@@ -125,6 +108,3 @@ configs:
   healthcheck_js:
     name: ${STACK_NAME}_healthcheck_js
     file: healthcheck.js
-  entrypoint:
-    name: ${STACK_NAME}_custom-entrypoint.sh
-    file: custom-entrypoint.sh

custom-entrypoint.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export OAUTH2_CLIENT_ID=$(cat /run/secrets/sso_id)
-export OAUTH2_SECRET=$(cat /run/secrets/sso_secret)
-
-node /build/main.js