- up to 0.2.0

diff --git a/letsencrypt.sh.spec b/letsencrypt.sh.spec
index 0aed3c98ee2106f8927e02b5ca4c21c66b81776a..5baf6f5055c6d8c6c5ea3c3cd25683821fe6b9a7 100644 (file)
--- a/letsencrypt.sh.spec
+++ b/letsencrypt.sh.spec
@@ -1,11 +1,11 @@
 Summary:       letsencrypt/acme client implemented as a shell-script
 Name:          letsencrypt.sh
-Version:       0.1.0
+Version:       0.2.0
 Release:       1
 License:       MIT
 Group:         Applications/Networking
 Source0:       https://github.com/lukas2511/letsencrypt.sh/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: eadd134cc5365753c03929dd70db341d
+# Source0-md5: 74974ab79d6879b92ba353bbf3d1257e
 Source1:       apache.conf
 Source2:       lighttpd.conf
 Source3:       config.sh
@@ -63,6 +63,9 @@ cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
+# we have own script
+rm $RPM_BUILD_ROOT/etc/cron.d/letsencrypt.sh
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 

diff --git a/pld.patch b/pld.patch
index 58f706cf1432450e90bbaf38cfc8aaf19a749c9d..e2545a8d2cbf29fefaa7895051655c4294ce4ca6 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -15,10 +15,10 @@
        if [[ -e "${check_config}/config.sh" ]]; then
          BASEDIR="${check_config}"
          CONFIG="${check_config}/config.sh"
-@@ -109,7 +109,7 @@
+@@ -117,7 +117,7 @@ load_config() {
  
-   [[ -z "${PRIVATE_KEY}" ]] && PRIVATE_KEY="${BASEDIR}/private_key.pem"
-   [[ -z "${PRIVATE_KEY_JSON}" ]] && PRIVATE_KEY_JSON="${BASEDIR}/private_key.json"
+   [[ -z "${ACCOUNT_KEY}" ]] && ACCOUNT_KEY="${BASEDIR}/private_key.pem"
+   [[ -z "${ACCOUNT_KEY_JSON}" ]] && ACCOUNT_KEY_JSON="${BASEDIR}/private_key.json"
 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/.acme-challenges"
 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="${BASEDIR}/acme-challenges"
    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"