/[smecontribs]/rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec

Diff of /rpms/smeserver-letsencrypt/contribs9/smeserver-letsencrypt.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.1 by unnilennium,
Mon Feb  6 20:50:28 2017 UTC
+Revision 1.22 by jcrisp,
Thu Mar 12 22:48:58 2020 UTC
 Line 1
  %define name smeserver-letsencrypt
- %define version 0.4
+ %define version 0.5
- %define release 1
+ %define release 15
  Summary: Plugin to enable letsencrypt certificates
  Name: %{name}
  Version: %{version}
 Line 9 
 License: GNU GPL version 2
  URL: https://letsencrypt.org/
  Group: SMEserver/addon
  Source: %{name}-%{version}.tar.gz
+ 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 >= 8.0
+ Requires: e-smith-release >= 9.0
- Requires: dehydrated >= 0.3.1
+ Requires: dehydrated >= 0.6.5
  AutoReqProv: no
  %description
-Line 21 
 Lets Encrypt is a free, automated, and o
+Line 31 
 Lets Encrypt is a free, automated, and o
  https://letsencrypt.org/
  %changelog
+ * Thu Mar 12  2020 John Crisp <jcrisp@safeandsoundit.co.uk> 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 <tests@pialasse.com> 0.5-14.sme
+ - take 2: remove dangling cron.daily dir missed in 0.5-12 [SME: 10862]
+ * Mon Mar 09 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-13.sme
+ - remove dangling cron.daily dir missed in 0.5-12 [SME: 10862]
+ * Sat Jan 18 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-12.sme
+ - forgot to remove template-begin and cron.daily dir [SME: 10862]
+ * Fri Jan 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-11.sme
+ - force required version to 0.6.5 for EPEL version
+ - Add new cron template for EPEL version of dehydrated [SME: 10862]
+ * Fri Jan 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-10.sme
+ - Fix incorrect HOOK entry in config [SME: 10861]
+ * Fri Jan 04 2019 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-9.sme
+ - Fix incorrect CA line in config [SME: 10688]
+ * Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-8.sme
+ - Reverse my previous error [SME: 10681]
+ * Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-7.sme
+ - fix spec file numbering
+ * Mon Dec 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-6.sme
+ - Fix typo error in cron.daily [SME: 10681]
+ * Sun Dec 23 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-5.sme
+ - Fix changed V1 staging URL [SME: 10595]
+ - Thanks Terry Fage
+ * Wed Dec 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-4.sme
+ - log to file rather than /dev/null [SME: 10412]
+ * Tue Oct 13 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-3.sme
+ - remove Licence key from config template [SME:10636]
+ * Tue Jun 19 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-2.sme
+ - remove debug print lines
+ * Tue Jun 12 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.5-1.sme
+ - Update to v2 API [SME:10595]
+ - Add key letsencrypt hostOverride to ignore 'Self' host check
+ - This requires v0.6 of dehydrated
+ * Wed Jun 06 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-6.sme
+ - Fix missing event actions [SME: 10315]
+ * Thu May 31 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-5.sme
+ - Fix typo in Accept Terms
+ - add domain-delete to createlinks [SME: 10315]
+ - Update requires release to SME v9
+ - Update requires dehydrated to v0.5
+ * Fri Aug 18 2017 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-4.sme
+ - change ACCEPT_TERMS template position to appear after shebang in config file [SME: 10410]
+ * Wed Jul 12 2017 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-3.sme
+ - remove workaround for curl dns resolution [SME: 10300]
+ - should be corrected at dnscache level (djbdns-1.05-10)
+ * Fri Apr 28 2017 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-2.sme
+ - help accept licence  [SME: 10253]
+ - workaround for curl issues
+ - spec tidying
  * Sat Feb 04 2017 John Crisp <jcrisp@safeandsoundit.co.uk> 0.4-1
   - first attempt at using stock letsencrypt script
-Line 145 
 https://letsencrypt.org/
+Line 225 
 https://letsencrypt.org/
  %prep
  %setup
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
+ %patch4 -p1
+ %patch5 -p1
+ %patch6 -p1
+ %patch7 -p1
+ %patch8 -p1
+ # remove old template
+ rm -rf root/etc/e-smith/templates/etc/cron.daily
  %build
  perl createlinks
-Line 169 
 rm -rf %{name}-%{version}
+Line 261 
 rm -rf %{name}-%{version}
  %preun
  %post
- if [[ ! -e /etc/letsencrypt.sh ]];
+ # if previously installed letsencrypt.sh, but first migration to dehydrated
- then mv -f /etc/letsencrypt.sh /etc/letsencrypt.sh.old;
+ if [[ -e /etc/letsencrypt.sh ]] && [[ ! -e /etc/dehydrated ]];
+ then
+         # assume in production
+ #       CA="https://acme-v01.api.letsencrypt.org/directory" ;
+ #       CAHASH="$(echo "${CA}" | urlbase64)"
+ #       mkdir /etc/dehydrated;
+ #       mkdir -p /etc/dehydrated/accounts
+ #       cp -a /etc/letsencrypt.sh/private_key.json /etc/dehydrated/accounts/${CAHASH}/registration_info.json
+ #       cp -a /etc/letsencrypt.sh/private_key.pem /etc/dehydrated/accounts/${CAHASH}/account_key.pem
+ #       cp -a /etc/letsencrypt.sh/certs /etc/dehydrated/
+         mv -f /etc/letsencrypt.sh /etc/letsencrypt.sh.old;
+ fi
+ # if letsencrypt still there but already migrated to dehydrated
+ if [[ -e /etc/letsencrypt.sh ]] && [[  -e /etc/dehydrated/certs ]];
+ then
+         mv -f /etc/letsencrypt.sh /etc/letsencrypt.sh.old;
  fi
+ # if first installation of dehydrated
  if [[ ! -e /etc/dehydrated ]];
  then mkdir /etc/dehydrated;
  fi
-Line 189 
 if [[ -f /usr/local/bin/domain.txt ]];
+Line 298 
 if [[ -f /usr/local/bin/domain.txt ]];
  then mv -f /usr/local/bin/domains.txt /usr/local/bin/domains.txt.orig;
  fi
+ if [[ -d /etc/cron.daily/letsencrypt ]];
+ then rm -rf /etc/cron.daily/letsencrypt;
+ fi
+ 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
-Line 196 
 fi
+Line 313 
 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
- echo "###################################################################"
+ if [[  -e /etc/cron.daily/letsencrypt ]];
- echo ""
+ then rm -rf /etc/cron.daily/letsencrypt
- echo "************************************************************"
+ fi
- echo " NOTE ! letsencrypt.sh has had to be renamed to 'dehydrated'"
- echo "************************************************************"
- echo ""
- echo "# After install please set your db keys"
- echo "# Make sure you set the letsencrypt status key to test"
- echo "# Enable some domains or hosts"
- echo "# Then run the following"
- echo "# signal-event console-save"
- echo "# dehydrated -c"
- echo "# Once you are satisfied set the letsencrypt status key to enabled"
- echo "# mv /etc/dehydrated/private_key.pem /etc/dehydrated/private_key.test"
- echo "# Run the dehydrated file again to generate your keys"
- echo "# signal-event console-save"
- echo "# dehydrated -c -x"
- echo "# Thereafter only use"
- echo "# dehydrated -c"
- echo "# If you make any key changes run console-save first"
- echo "###################################################################"
  %postun

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1