starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-04-24 09:18:28 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

Add MSYS support

Browse Source
This commit is contained in:
Haddon CD
2017-03-28 02:30:40 +01:00
committed by Lukas Schauer
parent 0dcf94dd3d
commit ba31a505d2
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dehydrated
View File

@@ -303,7 +303,7 @@ init_system() {
# Different sed version for different os types... # Different sed version for different os types...
_sed() { _sed() {
if [[ "${OSTYPE}" = "Linux" ]]; then if [[ "${OSTYPE}" = "Linux" || "${OSTYPE::5}" = "MINGW" ]]; then
sed -r "${@}" sed -r "${@}"
else else
sed -E "${@}" sed -E "${@}"
@@ -758,7 +758,13 @@ sign_domain() {
if [ "${OCSP_MUST_STAPLE}" = "yes" ]; then if [ "${OCSP_MUST_STAPLE}" = "yes" ]; then
printf "\n1.3.6.1.5.5.7.1.24=DER:30:03:02:01:05" >> "${tmp_openssl_cnf}" printf "\n1.3.6.1.5.5.7.1.24=DER:30:03:02:01:05" >> "${tmp_openssl_cnf}"
fi fi
openssl req -new -sha256 -key "${CERTDIR}/${domain}/${privkey}" -out "${CERTDIR}/${domain}/cert-${timestamp}.csr" -subj "/CN=${domain}/" -reqexts SAN -config "${tmp_openssl_cnf}" SUBJ="/CN=${domain}/"
if [[ "${OSTYPE::5}" = "MINGW" ]]; then
# The subject starts with a /, so MSYS will assume it's a path and convert
# it unless we escape it with another one:
SUBJ="/${SUBJ}"
fi
openssl req -new -sha256 -key "${CERTDIR}/${domain}/${privkey}" -out "${CERTDIR}/${domain}/cert-${timestamp}.csr" -subj "${SUBJ}" -reqexts SAN -config "${tmp_openssl_cnf}"
rm -f "${tmp_openssl_cnf}" rm -f "${tmp_openssl_cnf}"
crt_path="${CERTDIR}/${domain}/cert-${timestamp}.pem" crt_path="${CERTDIR}/${domain}/cert-${timestamp}.pem"