]>
Commit | Line | Data |
---|---|---|
0b9f695c ER |
1 | --- dehydrated-0.3.1/dehydrated 2016-05-14 15:51:55.000000000 +0300 |
2 | +++ dehydrated-0.3.1/dehydrated 2016-10-17 22:03:54.184281322 +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 | |
0b9f695c | 9 | @@ -94,7 +94,7 @@ |
f5fc6721 ER |
10 | load_config() { |
11 | # Check for config in various locations | |
12 | if [[ -z "${CONFIG:-}" ]]; then | |
0b9f695c ER |
13 | - for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SCRIPTDIR}"; do |
14 | + for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do | |
15 | if [[ -f "${check_config}/config" ]]; then | |
f5fc6721 | 16 | BASEDIR="${check_config}" |
0b9f695c | 17 | CONFIG="${check_config}/config" |
2e509387 ER |
18 | @@ -181,7 +181,7 @@ |
19 | ||
20 | [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs" | |
21 | [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt" | |
22 | - [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated" | |
23 | + [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated" | |
24 | [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock" | |
25 | [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE="" | |
26 |