root
/
telebit.js
mirror of https://git.coolaj86.com/coolaj86/telebit.js.git
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
AJ ONeal 2018-09-24 22:44:47 -06:00
parent e16e5a34e6 f3821b7dac
commit 1fc04f05b5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/telebitd.js
View File

@ -783,6 +783,7 @@ function greenlockHelper(state) {
version: state.greenlockConf.version || 'draft-11' version: state.greenlockConf.version || 'draft-11'
, server: state.greenlockConf.server || 'https://acme-v02.api.letsencrypt.org/directory' , server: state.greenlockConf.server || 'https://acme-v02.api.letsencrypt.org/directory'
, communityMember: state.greenlockConf.communityMember || state.config.communityMember , communityMember: state.greenlockConf.communityMember || state.config.communityMember
, _communityPackage: 'telebit.js'
, telemetry: state.greenlockConf.telemetry || state.config.telemetry , telemetry: state.greenlockConf.telemetry || state.config.telemetry
, configDir: state.greenlockConf.configDir , configDir: state.greenlockConf.configDir
|| (state.config.root && path.join(state.config.root, 'etc/acme')) || (state.config.root && path.join(state.config.root, 'etc/acme'))

8
usr/share/install.sh
View File

@ -59,9 +59,9 @@ http_get()
http_bash() http_bash()
{ {
_http_bash_url=$1 local _http_bash_url=$1
_http_bash_args=${2:-} local _http_bash_args=${2:-}
_http_bash_tmp=$(mktemp) local _http_bash_tmp=$(mktemp)
$_my_http_get $_my_http_opts $_my_http_out "$_http_bash_tmp" "$_http_bash_url" $_my_http_get $_my_http_opts $_my_http_out "$_http_bash_tmp" "$_http_bash_url"
bash "$_http_bash_tmp" $_http_bash_args; rm "$_http_bash_tmp" bash "$_http_bash_tmp" $_http_bash_args; rm "$_http_bash_tmp"
} }
@ -77,7 +77,7 @@ export -f http_bash
if [ -n "${TELEBIT_VERSION:-}" ]; then if [ -n "${TELEBIT_VERSION:-}" ]; then
echo 'TELEBIT_VERSION='${TELEBIT_VERSION} echo 'TELEBIT_VERSION='${TELEBIT_VERSION}
fi fi
TELEBIT_VERSION=${TELEBIT_VERSION:-master} export TELEBIT_VERSION=${TELEBIT_VERSION:-master}
if [ -e "usr/share/install_helper.sh" ]; then if [ -e "usr/share/install_helper.sh" ]; then
bash usr/share/install_helper.sh "$@" bash usr/share/install_helper.sh "$@"
else else