diff options
-rw-r--r-- | .meteor/packages | 6 | ||||
-rw-r--r-- | .meteor/versions | 4 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | rebuild-wekan.bat | 4 | ||||
-rwxr-xr-x | rebuild-wekan.sh | 4 | ||||
-rwxr-xr-x | releases/virtualbox/rebuild-wekan.sh | 5 | ||||
-rw-r--r-- | snapcraft.yaml | 8 | ||||
-rwxr-xr-x | stacksmith/user-scripts/build.sh | 6 |
8 files changed, 35 insertions, 6 deletions
diff --git a/.meteor/packages b/.meteor/packages index 964c070f..0b43cbef 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -31,7 +31,9 @@ kenton:accounts-sandstorm service-configuration@1.0.11 useraccounts:unstyled useraccounts:flow-routing -salleman:accounts-oidc +wekan:wekan-ldap +wekan:accounts-cas +wekan-accounts-oidc # Utilities check@1.2.5 @@ -86,8 +88,6 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache -wekan:wekan-ldap -wekan:accounts-cas wekan-scrollbar mquandalle:perfect-scrollbar mdg:meteor-apm-agent diff --git a/.meteor/versions b/.meteor/versions index 71e2efac..239ddb37 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -145,8 +145,8 @@ reload@1.1.11 retry@1.0.9 routepolicy@1.0.12 rzymek:fullcalendar@3.8.0 -salleman:accounts-oidc@1.0.10 -salleman:oidc@1.0.12 +wekan-accounts-oidc@1.0.10 +wekan-oidc@1.0.12 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 @@ -267,6 +267,10 @@ RUN \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \ + gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \ + gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \ + gosu wekan:wekan rm -rf meteor-accounts-oidc && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 48ef393b..5d0fa37d 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -34,6 +34,10 @@ git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git me 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
+move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+move meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+del /S /F /Q meteor-accounts-oidc
REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
cd ..
REM del /S /F /Q node_modules
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 1b2016d0..f712d31c 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -118,6 +118,10 @@ 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/rebuild-wekan.sh b/releases/virtualbox/rebuild-wekan.sh index 7501cee1..546e9d1e 100755 --- a/releases/virtualbox/rebuild-wekan.sh +++ b/releases/virtualbox/rebuild-wekan.sh @@ -71,7 +71,10 @@ 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/snapcraft.yaml b/snapcraft.yaml index afa9eaf4..be6d0586 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -176,6 +176,14 @@ parts: git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git cd .. fi + if [ ! -d "packages/wekan_accounts-oidc" ]; then + cd packages + 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 + cd .. + fi rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index 7e59c531..2c55d4f0 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -75,6 +75,12 @@ sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.g sudo -u wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git +sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git +sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git +sudo -u wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc +sudo -u wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc +sudo -u wekan rm -rf meteor-accounts-oidc + sudo sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js sudo -u wekan /home/wekan/.meteor/meteor -- help |