summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-09-28 00:23:31 +0300
committerLauri Ojansivu <x@xet7.org>2018-09-28 00:23:31 +0300
commitbd6e4a351b984b032e17c57793a70923eb17d8f5 (patch)
tree599f41b6fa5d16614ec01e5945eb8430edd98f0d
parenta404612174ccd19763247e996182b5a5521929d5 (diff)
downloadwekan-bd6e4a351b984b032e17c57793a70923eb17d8f5.tar.gz
wekan-bd6e4a351b984b032e17c57793a70923eb17d8f5.tar.bz2
wekan-bd6e4a351b984b032e17c57793a70923eb17d8f5.zip
Add CAS with attributes.
Thanks to ppoulard !
-rw-r--r--.gitignore1
-rw-r--r--.meteor/packages2
-rw-r--r--.meteor/versions2
-rw-r--r--Dockerfile1
-rw-r--r--snapcraft.yaml5
5 files changed, 9 insertions, 2 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 d428111c..55fa7727 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -84,7 +84,7 @@ cfs:gridfs
eluck:accounts-lockout
rzymek:fullcalendar
momentjs:moment@2.22.2
-atoy40:accounts-cas
browser-policy-framing
mquandalle:moment
msavin:usercache
+wekan:accounts-cas
diff --git a/.meteor/versions b/.meteor/versions
index f1f52d23..5f742b3c 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -10,7 +10,6 @@ aldeed:simple-schema@1.5.3
alethes:pages@1.8.6
allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2
-atoy40:accounts-cas@0.0.2
audit-argument-checks@1.0.7
autoupdate@1.3.12
babel-compiler@6.24.7
@@ -180,4 +179,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 1d0f20e6..376389a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -148,6 +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/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; \
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