diff --git a/installer/get.sh b/installer/get.sh index 36333d3..e66596f 100644 --- a/installer/get.sh +++ b/installer/get.sh @@ -7,7 +7,7 @@ my_ver=master my_tmp=$(mktemp -d) mkdir -p $my_tmp/opt/$my_name/lib/node_modules/$my_name -git clone https://git.daplie.com/Daplie/goldilocks.js.git $my_tmp/opt/$my_name/lib/node_modules/$my_name +git clone https://git.coolaj86.com/coolaj86/goldilocks.js.git $my_tmp/opt/$my_name/lib/node_modules/$my_name echo "Installing to $my_tmp (will be moved after install)" pushd $my_tmp/opt/$my_name/lib/node_modules/$my_name diff --git a/installer/install.sh b/installer/install.sh index 3f5b306..7f427e6 100644 --- a/installer/install.sh +++ b/installer/install.sh @@ -10,7 +10,7 @@ my_name=goldilocks my_app_pkg_name=com.daplie.goldilocks.web my_app_ver="v1.1" my_azp_oauth3_ver="v1.2.3" -export NODE_VERSION="v8.9.0" +export NODE_VERSION="v8.9.3" if [ -z "${my_tmp-}" ]; then my_tmp="$(mktemp -d)" @@ -29,7 +29,7 @@ my_npm="$NPM_CONFIG_PREFIX/bin/npm" my_app_dist=$my_tmp/opt/$my_name/lib/node_modules/$my_name/dist -installer_base="https://git.daplie.com/Daplie/goldilocks.js/raw/$my_app_ver" +installer_base="https://git.coolaj86.com/coolaj86/goldilocks.js/raw/$my_app_ver" # Backwards compat # some scripts still use the old names diff --git a/package.json b/package.json index b3ddf4a..a35b546 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "goldilocks", - "version": "1.1.5", + "version": "1.1.6", "description": "The node.js webserver that's just right, Greenlock (HTTPS/TLS/SSL via ACME/Let's Encrypt) and tunneling (RVPN) included.", "main": "bin/goldilocks.js", "repository": { "type": "git", - "url": "git@git.daplie.com:Daplie/goldilocks.js.git" + "url": "git.coolaj86.com:coolaj86/goldilocks.js.git" }, - "author": "AJ ONeal (https://daplie.com/)", + "author": "AJ ONeal (https://coolaj86.com/)", "license": "(MIT OR Apache-2.0)", "scripts": { "test": "node bin/goldilocks.js -p 8443 -d /tmp/" @@ -34,41 +34,41 @@ "server" ], "bugs": { - "url": "https://git.daplie.com/Daplie/server-https/issues" + "url": "https://git.coolaj86.com/coolaj86/goldilocks.js/issues" }, - "homepage": "https://git.daplie.com/Daplie/goldilocks.js", + "homepage": "https://git.coolaj86.com/coolaj86/goldilocks.js", "dependencies": { "bluebird": "^3.4.6", - "body-parser": "git+https://github.com/expressjs/body-parser.git#1.16.1", + "body-parser": "1", "commander": "^2.9.0", "deep-equal": "^1.0.1", - "dns-suite": "git+https://git@git.daplie.com/Daplie/dns-suite#v1", - "express": "git+https://github.com/expressjs/express.git#4.x", + "dns-suite": "1", + "express": "4", "finalhandler": "^0.4.0", - "greenlock": "git+https://git.daplie.com/Daplie/node-greenlock.git#master", + "greenlock": "2.1", "http-proxy": "^1.16.2", - "human-readable-ids": "git+https://git.daplie.com/Daplie/human-readable-ids-js#master", - "ipaddr.js": "git+https://github.com/whitequark/ipaddr.js.git#v1.3.0", + "human-readable-ids": "1", + "ipaddr.js": "v1.3", "js-yaml": "^3.8.3", "jsonschema": "^1.2.0", "jsonwebtoken": "^7.4.0", - "le-challenge-fs": "git+https://git.daplie.com/Daplie/le-challenge-webroot.git#master", + "le-challenge-fs": "2", "le-challenge-sni": "^2.0.1", - "le-store-certbot": "git+https://git.daplie.com/Daplie/le-store-certbot.git#master", + "le-store-certbot": "2", "localhost.daplie.me-certificates": "^1.3.5", "network": "^0.4.0", - "recase": "git+https://git.daplie.com/coolaj86/recase-js.git#v1.0.4", + "recase": "v1.0.4", "redirect-https": "^1.1.0", "request": "^2.81.0", - "scmp": "git+https://github.com/freewil/scmp.git#1.x", + "scmp": "1", "serve-index": "^1.7.0", "serve-static": "^1.10.0", "server-destroy": "^1.0.1", "sni": "^1.0.0", "socket-pair": "^1.0.3", "socksv5": "0.0.6", - "stunnel": "git+https://git.daplie.com/Daplie/node-tunnel-client.git#v1", - "stunneld": "git+https://git.daplie.com/Daplie/node-tunnel-server.git#v1", + "stunnel": "1.0", + "stunneld": "0.9", "tunnel-packer": "^1.3.0", "ws": "^2.3.1" }