Merge remote-tracking branch 'origin/master'

Conflicts:
	letsencrypt.sh.spec

diff --cc letsencrypt.sh.spec
index 029b3d10241d46e69a0ed4b3e44fa853c0c61c17,d06abad827eec404a2e7399f5d5b5681aa971119..0aed3c98ee2106f8927e02b5ca4c21c66b81776a
--- 1/letsencrypt.sh.spec
--- 2/letsencrypt.sh.spec
+++ b/letsencrypt.sh.spec
@@@ -50,18 -48,19 +50,19 @@@ Current features
  
  %install
  rm -rf $RPM_BUILD_ROOT
 -install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs}}
 -install -d $RPM_BUILD_ROOT/etc/cron.d
 +install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/{acme-challenges,certs},/etc/cron.d}
  
  install -p letsencrypt.sh $RPM_BUILD_ROOT%{_sbindir}
--
  cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
  cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
  cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
  cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
 +cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/letsencrypt
 +install -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}
  cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
  
+ cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+ 
  %clean
  rm -rf $RPM_BUILD_ROOT