Compare commits

..

6 Commits
master ... v1.2

Author SHA1 Message Date
AJ ONeal
567c1cf39f update version, duh 2017-11-10 17:04:26 -07:00
AJ ONeal
b803229dac Merge branch 'v1.2' of git.daplie.com:Daplie/walnut.js into v1.2 2017-11-10 12:52:33 -07:00
AJ ONeal
ed9b05913e update urls 2017-11-10 12:52:27 -07:00
AJ ONeal
20eccd5f31 Merge branch 'master' into 'v1.2'
use updated oauth3

See merge request !4
2017-11-08 12:59:36 -07:00
AJ ONeal
4914b28b08 Update install.sh 2017-11-08 12:58:38 -07:00
AJ ONeal
ff95bfedb8 Update README.md 2017-11-07 16:47:44 -07:00
2 changed files with 10 additions and 9 deletions

View File

@ -9,6 +9,8 @@ my_name=walnut
my_app_pkg_name=com.daplie.walnut.web
my_app_ver="v1.2"
my_azp_oauth3_ver="v1.2"
# is the old version still needed in launchpad?
#my_azp_oauth3_ver="v1.1.3"
export NODE_VERSION="v8.9.0"
if [ -z "${my_tmp-}" ]; then
@ -24,9 +26,8 @@ fi
### IMPORTANT ###
### VERSION ###
#my_app_ver="v1.1"
my_app_ver="installer-v2"
my_app_ver="v1.2"
my_launchpad_ver="v1.2"
my_azp_oauth3_ver="v1.1.3"
my_iss_oauth3_rest_ver="v1.2.0"
my_iss_oauth3_pages_ver="v1.2.1"
my_www_daplie_ver=v1.0.15
@ -106,20 +107,20 @@ pushd $my_tmp/opt/$my_name/core/lib/walnut@daplie.com/setup
git pull
git checkout $my_launchpad_ver
git clone https://git.daplie.com/OAuth3/oauth3.js.git ./assets/oauth3.org
git clone https://git.oauth3.org/OAuth3/oauth3.js.git ./assets/oauth3.org
pushd assets/oauth3.org
git checkout $my_azp_oauth3_ver
popd
popd
pushd $my_tmp/opt/$my_name/packages
git clone https://git.daplie.com/OAuth3/issuer_oauth3.org.git rest/issuer@oauth3.org
git clone https://git.oauth3.org/OAuth3/issuer.rest.walnut.js.git rest/issuer@oauth3.org
pushd rest/issuer@oauth3.org/
git checkout $my_iss_oauth3_rest_ver
$my_npm install
popd
git clone https://git.daplie.com/OAuth3/org.oauth3.git pages/issuer@oauth3.org
git clone https://git.oauth3.org/OAuth3/issuer.html.git pages/issuer@oauth3.org
pushd pages/issuer@oauth3.org
git checkout $my_iss_oauth3_pages_ver
bash ./install.sh

View File

@ -42,7 +42,7 @@
"dependencies": {
"bluebird": "3.x",
"body-parser": "1.x",
"cluster-store": "2.0.x",
"cluster-store": "git+https://git.daplie.com/Daplie/cluster-store.git#v2",
"connect": "3.x",
"connect-cors": "0.5.x",
"connect-recase": "^1.0.2",
@ -57,17 +57,17 @@
"jwk-to-pem": "^1.2.6",
"mailchimp-api-v3": "^1.7.0",
"mandrill-api": "^1.0.45",
"masterquest-sqlite3": "1.0.x",
"masterquest-sqlite3": "git+https://git.daplie.com/node/masterquest-sqlite3.git",
"mkdirp": "^0.5.1",
"multiparty": "^4.1.3",
"nodemailer": "^1.4.0",
"nodemailer-mailgun-transport": "1.x",
"oauth3.js": "git+https://git.oauth3.org/OAuth3/oauth3.js.git",
"oauth3.js": "git+https://git.oauth3.org/OAuth3/oauth3.js.git#v1.2",
"recase": "^1.0.4",
"request": "^2.81.0",
"scmp": "^2.0.0",
"serve-static": "1.x",
"sqlite3-cluster": "2.1.x",
"sqlite3-cluster": "git+https://git.daplie.com/coolaj86/sqlite3-cluster.git#v2",
"stripe": "^4.22.0",
"twilio": "1.x"
}