--- rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec 2018/06/19 13:22:02 1.7 +++ rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec 2020/01/17 15:20:48 1.17 @@ -1,6 +1,6 @@ %define name smeserver-letsencrypt %define version 0.5 -%define release 1 +%define release 11 Summary: Plugin to enable letsencrypt certificates Name: %{name} Version: %{version} @@ -9,13 +9,21 @@ License: GNU GPL version 2 URL: https://letsencrypt.org/ Group: SMEserver/addon Source: %{name}-%{version}.tar.gz -#Patch0: smeserver-letsencrypt-xyz.patch +Patch0: smeserver-letsencrypt-remove-debug-lines.patch +Patch1: smeserver-letsencrypt-remove-licence.patch +Patch2: smeserver-letsencrypt-log-to-file.patch +Patch3: smeserver-letsencrypt-API1-URL-change.patch +Patch4: smeserver-letsencrypt-fix-logging.patch +Patch5: smeserver-letsencrypt-fix-logging-reverse.patch +Patch6: smeserver-letsencrypt-fix-acme-v01-url.patch +Patch7: smeserver-letsencrypt-fix-hook-entry.patch +Patch8: smeserver-letsencrypt-change-cron-entry.patch BuildRoot: /var/tmp/%{name}-%{version} BuildArchitectures: noarch BuildRequires: e-smith-devtools Requires: e-smith-release >= 9.0 -Requires: dehydrated >= 0.6 +Requires: dehydrated >= 0.6.5 AutoReqProv: no %description @@ -23,6 +31,38 @@ Lets Encrypt is a free, automated, and o https://letsencrypt.org/ %changelog +* Fri Jan 17 2020 John Crisp 0.5-11.sme +- force required versioni to 0.6.5 for EPEL version +- Add new cron template for EPEL version of dehydrated [SME: 10862] + +* Fri Jan 17 2020 John Crisp 0.5-10.sme +- Fix incorrect HOOK entry in config [SME: 10861] + +* Fri Jan 04 2019 John Crisp 0.5-9.sme +- Fix incorrect CA line in config [SME: 10688] + +* Mon Dec 31 2018 John Crisp 0.5-8.sme +- Reverse my previous error [SME: 10681] + +* Mon Dec 31 2018 John Crisp 0.5-7.sme +- fix spec file numbering + +* Mon Dec 31 2018 John Crisp 0.5-6.sme +- Fix typo error in cron.daily [SME: 10681] + +* Sun Dec 23 2018 John Crisp 0.5-5.sme +- Fix changed V1 staging URL [SME: 10595] +- Thanks Terry Fage + +* Wed Dec 12 2018 John Crisp 0.5-4.sme +- log to file rather than /dev/null [SME: 10412] + +* Tue Oct 13 2018 John Crisp 0.5-3.sme +- remove Licence key from config template [SME:10636] + +* Tue Jun 19 2018 John Crisp 0.5-2.sme +- remove debug print lines + * Tue Jun 12 2018 John Crisp 0.5-1.sme - Update to v2 API [SME:10595] - Add key letsencrypt hostOverride to ignore 'Self' host check @@ -173,7 +213,15 @@ https://letsencrypt.org/ %prep %setup -# patch0 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build perl createlinks @@ -239,6 +287,10 @@ if [[ ! -e /home/e-smith/files/ibays/Pri then mkdir -p /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge; fi +if [[ -f /etc/cron.daily/letsencrypt ]]; +then rm -f /etc/cron.daily/letsencrypt; +fi + chmod -R 0775 /home/e-smith/files/ibays/Primary/html/.well-known chown -R apache:shared /home/e-smith/files/ibays/Primary/html/.well-known