--- rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec 2020/02/17 15:35:44 1.18 +++ rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec 2020/03/12 22:48:58 1.22 @@ -1,6 +1,6 @@ %define name smeserver-letsencrypt %define version 0.5 -%define release 12 +%define release 15 Summary: Plugin to enable letsencrypt certificates Name: %{name} Version: %{version} @@ -31,6 +31,15 @@ Lets Encrypt is a free, automated, and o https://letsencrypt.org/ %changelog +* Thu Mar 12 2020 John Crisp 0.5-15.sme +- take 3: remove dangling cron.daily dir missed in 0.5-12 [SME: 10862] + +* Wed Mar 11 2020 Jean-Philipe Pialasse 0.5-14.sme +- take 2: remove dangling cron.daily dir missed in 0.5-12 [SME: 10862] + +* Mon Mar 09 2020 John Crisp 0.5-13.sme +- remove dangling cron.daily dir missed in 0.5-12 [SME: 10862] + * Sat Jan 18 2020 John Crisp 0.5-12.sme - forgot to remove template-begin and cron.daily dir [SME: 10862] @@ -226,6 +235,9 @@ https://letsencrypt.org/ %patch7 -p1 %patch8 -p1 +# remove old template +rm -rf root/etc/e-smith/templates/etc/cron.daily + %build perl createlinks @@ -286,17 +298,23 @@ if [[ -f /usr/local/bin/domain.txt ]]; then mv -f /usr/local/bin/domains.txt /usr/local/bin/domains.txt.orig; fi -if [[ ! -e /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge ]]; -then mkdir -p /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge; -fi - if [[ -d /etc/cron.daily/letsencrypt ]]; then rm -rf /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 +if [[ -d /etc/e-smith/templates/etc/cron.daily/letsencrypt ]]; +then rm -rf /root/etc/e-smith/templates/etc/cron.daily/letsencrypt +fi +if [[ ! -e /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge ]]; +then mkdir -p /home/e-smith/files/ibays/Primary/html/.well-known/acme-challenge; +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 +# remove old template file +if [[ -e /etc/cron.daily/letsencrypt ]]; +then rm -rf /etc/cron.daily/letsencrypt +fi %postun