From c6cea2fb4e9e17403fe0ce2ba5bf2d20dcf81a8f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 28 Sep 2018 00:38:17 +0300 Subject: - Add CAS with attributes. Thanks to ppoulard ! --- .gitignore | 1 + .meteor/packages | 3 +-- .meteor/versions | 2 +- Dockerfile | 4 +--- snapcraft.yaml | 5 +++++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7a56bd2e..c3f1293e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ npm-debug.log .build/* packages/kadira-flow-router/ packages/meteor-useraccounts-core/ +packages/meteor-accounts-cas/ package-lock.json **/parts/ **/stage diff --git a/.meteor/packages b/.meteor/packages index cf859f61..2339c484 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -31,7 +31,6 @@ kenton:accounts-sandstorm service-configuration@1.0.11 useraccounts:unstyled useraccounts:flow-routing -#salleman:accounts-oidc # Utilities check@1.2.5 @@ -87,4 +86,4 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache -ppoulard:accounts-cas +wekan:accounts-cas diff --git a/.meteor/versions b/.meteor/versions index c318eebe..184cba0e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -128,7 +128,6 @@ peerlibrary:blaze-components@0.15.1 peerlibrary:computed-field@0.7.0 peerlibrary:reactive-field@0.3.0 perak:markdown@1.0.5 -ppoulard:accounts-cas@0.1.0 promise@0.10.0 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 @@ -175,4 +174,5 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 +wekan:accounts-cas@0.1.0 zimme:active-route@2.3.2 diff --git a/Dockerfile b/Dockerfile index dd0d85a3..376389a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -148,7 +148,7 @@ RUN \ cd /home/wekan/app/packages && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/ppoulard/meteor-accounts-cas.git meteor-accounts-cas && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas && \ 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; \ @@ -156,8 +156,6 @@ RUN \ # Build app cd /home/wekan/app && \ gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \ - # adding CAS - gosu wekan:wekan /home/wekan/.meteor/meteor add ppoulard:accounts-cas && \ gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ diff --git a/snapcraft.yaml b/snapcraft.yaml index dbe738d0..e4276976 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -142,6 +142,11 @@ parts: sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js cd .. fi + if [ ! -d "packages/meteor-accounts-cas" ]; then + cd packages + git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas + cd .. + fi rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser -- cgit v1.2.3-1-g7c22