diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-03-22 13:10:31 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-03-22 13:10:31 +0200 |
| commit | ab4774a59a39b00ad529069317781e64c9e84c95 (patch) | |
| tree | c443c618d731a38d6a09fc86bc540980d5e20bda /releases | |
| parent | b0d1ccc311d8cbfde56d91a1616927df47506aa1 (diff) | |
| parent | 296349a83b5b36060db33b2a7b5692008c30ef82 (diff) | |
| download | wekan-ab4774a59a39b00ad529069317781e64c9e84c95.tar.gz wekan-ab4774a59a39b00ad529069317781e64c9e84c95.tar.bz2 wekan-ab4774a59a39b00ad529069317781e64c9e84c95.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'releases')
| -rwxr-xr-x | releases/rebuild-wekan.sh | 5 | ||||
| -rwxr-xr-x | releases/virtualbox/start-wekan.sh | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/releases/rebuild-wekan.sh b/releases/rebuild-wekan.sh index ed439696..bee5a228 100755 --- a/releases/rebuild-wekan.sh +++ b/releases/rebuild-wekan.sh @@ -94,6 +94,11 @@ do git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git + git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git + mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc + mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc + rm -rf meteor-accounts-oidc + if [[ "$OSTYPE" == "darwin"* ]]; then echo "sed at macOS"; sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh index 9a948bac..77fbdd54 100755 --- a/releases/virtualbox/start-wekan.sh +++ b/releases/virtualbox/start-wekan.sh @@ -71,6 +71,8 @@ # 2) Configure the environment variables. This differs slightly # by installation type, but make sure you have the following: #export OAUTH2_ENABLED=true + # OAuth2 login style: popup or redirect. + #export OAUTH2_LOGIN_STYLE=redirect # Application GUID captured during app registration: #export OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx # Secret key generated during app registration: @@ -91,6 +93,8 @@ # ==== OAUTH2 KEYCLOAK ==== # https://github.com/wekan/wekan/wiki/Keycloak <== MAPPING INFO, REQUIRED #export OAUTH2_ENABLED=true + # OAuth2 login style: popup or redirect. + #export OAUTH2_LOGIN_STYLE=redirect #export OAUTH2_CLIENT_ID=<Keycloak create Client ID> #export OAUTH2_SERVER_URL=<Keycloak server name>/auth #export OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth @@ -99,11 +103,13 @@ #export OAUTH2_SECRET=<keycloak client secret> #----------------------------------------------------------------- # ==== OAUTH2 DOORKEEPER ==== + # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2 # https://github.com/wekan/wekan/issues/1874 # https://github.com/wekan/wekan/wiki/OAuth2 # Enable the OAuth2 connection #export OAUTH2_ENABLED=true - # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2 + # OAuth2 login style: popup or redirect. + #export OAUTH2_LOGIN_STYLE=redirect # OAuth2 Client ID. #export OAUTH2_CLIENT_ID=abcde12345 # OAuth2 Secret. |