]>
Commit | Line | Data |
---|---|---|
b64709ec ER |
1 | --- letsencrypt.sh-0.1.0/letsencrypt.sh 2016-05-14 15:51:55.000000000 +0300 |
2 | +++ letsencrypt.sh-0.1.0/letsencrypt.sh 2016-05-14 15:58:33.687279548 +0300 | |
f5fc6721 ER |
3 | @@ -1,4 +1,4 @@ |
4 | -#!/usr/bin/env bash | |
5 | +#!/bin/bash | |
6 | ||
7 | # letsencrypt.sh by lukas2511 | |
8 | # Source: https://github.com/lukas2511/letsencrypt.sh | |
9 | @@ -42,7 +42,7 @@ | |
10 | load_config() { | |
11 | # Check for config in various locations | |
12 | if [[ -z "${CONFIG:-}" ]]; then | |
13 | - for check_config in "/etc/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do | |
14 | + for check_config in "/etc/letsencrypt.sh" "/etc/webapps/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do | |
15 | if [[ -e "${check_config}/config.sh" ]]; then | |
16 | BASEDIR="${check_config}" | |
17 | CONFIG="${check_config}/config.sh" | |
eccbe1cf | 18 | @@ -117,7 +117,7 @@ load_config() { |
b64709ec | 19 | |
eccbe1cf AM |
20 | [[ -z "${ACCOUNT_KEY}" ]] && ACCOUNT_KEY="${BASEDIR}/private_key.pem" |
21 | [[ -z "${ACCOUNT_KEY_JSON}" ]] && ACCOUNT_KEY_JSON="${BASEDIR}/private_key.json" | |
b64709ec ER |
22 | - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/.acme-challenges" |
23 | + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/acme-challenges" | |
24 | [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" | |
25 | ||
26 | [[ -n "${PARAM_HOOK:-}" ]] && HOOK="${PARAM_HOOK}" |