Hello community, here is the log from the commit of package dehydrated for openSUSE:Factory checked in at 2020-04-21 13:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dehydrated (Old) and /work/SRC/openSUSE:Factory/.dehydrated.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dehydrated" Tue Apr 21 13:13:48 2020 rev:14 rq:796008 version:0.6.5 Changes: -------- --- /work/SRC/openSUSE:Factory/dehydrated/dehydrated.changes 2020-02-04 19:54:09.089349533 +0100 +++ /work/SRC/openSUSE:Factory/.dehydrated.new.2738/dehydrated.changes 2020-04-21 13:13:51.269193691 +0200 @@ -1,0 +2,6 @@ +Mon Apr 20 00:37:26 UTC 2020 - Daniel Molkentin <[email protected]> + +- Fix lighttpd config file (boo#1169834) +- Provide nginx subpackage for SLE 15+ (jsc#11756) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dehydrated.spec ++++++ --- /var/tmp/diff_new_pack.pzQbGv/_old 2020-04-21 13:13:52.493196133 +0200 +++ /var/tmp/diff_new_pack.pzQbGv/_new 2020-04-21 13:13:52.493196133 +0200 @@ -29,13 +29,18 @@ %bcond_with systemd %endif -%if 0%{?is_opensuse} || %{defined fedora} +%if 0%{?sle_version} >= 150000 || 0%{?is_opensuse} || %{defined fedora} %bcond_without nginx -%bcond_without lighttpd %else %bcond_with nginx +%endif + +%if 0%{?is_opensuse} || %{defined fedora} +%bcond_without lighttpd +%else %bcond_with lighttpd %endif + %{!?_tmpfilesdir: %global _tmpfilesdir %{_prefix}/lib/tmpfiles.d } # See also http://en.opensuse.org/openSUSE:Specfile_guidelines @@ -215,8 +220,8 @@ %if %{with lighttpd} install -m 0755 -d %{buildroot}%{_sysconfdir}/lighttpd/conf.d -sed "s,@CHALLENGEDIR@,%{_challengedir},g" %{SOURCE3} > acme-challenge -install -m 0644 acme-challenge %{buildroot}%{_sysconfdir}/lighttpd/conf.d +sed "s,@CHALLENGEDIR@,%{_challengedir},g" %{SOURCE3} > acme-challenge.conf +install -m 0644 acme-challenge.conf %{buildroot}%{_sysconfdir}/lighttpd/conf.d %endif #with lighttpd %if %{with systemd} @@ -248,6 +253,13 @@ diff -urN docs/examples/config %{buildroot}%{_home}/config ||: +# Rename existing config file config files fror nginx and lighttpd +%if %{with nginx} +%pre nginx +[ -f %{_sysconfdir}/nginx/conf.d/acme-challenge ] && \ + mv %{_sysconfdir}/nginx/conf.d/acme-challenge %{_sysconfdir}/nginx/conf.d/acme-challenge.conf || : +%endif + %files %defattr(-,root,root) %attr(750,root,%{_user}) %dir %{_sysconfdir}/dehydrated @@ -294,7 +306,7 @@ %if %{with lighttpd} %files lighttpd %defattr(-,root,root) -%config %attr(640,root,lighttpd) %{_sysconfdir}/lighttpd/conf.d/acme-challenge +%config %attr(640,root,lighttpd) %{_sysconfdir}/lighttpd/conf.d/acme-challenge.conf %endif #with lighttpd %changelog ++++++ acme-challenge.conf.lighttpd.in ++++++ --- /var/tmp/diff_new_pack.pzQbGv/_old 2020-04-21 13:13:52.581196308 +0200 +++ /var/tmp/diff_new_pack.pzQbGv/_new 2020-04-21 13:13:52.581196308 +0200 @@ -1,4 +1,4 @@ -server.modules += ("alias") +server.modules += ("mod_alias") alias.url += ( - "/.well-known/acme-challenge/" => "@CHALLENGEDIR@", + "/.well-known/acme-challenge/" => "@CHALLENGEDIR@/", )
