- updated URLs

[packages/dehydrated.git] / dehydrated.spec

diff --git a/dehydrated.spec b/dehydrated.spec
index 8e82c582d186f549daa965bc9de51bf56aed59c7..619ccbb9b51ba39e41a6354176175d90d74bd784 100644 (file)
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,11 +1,11 @@
 Summary:       letsencrypt/acme client implemented as a shell-script
 Name:          dehydrated
-Version:       0.6.2
+Version:       0.7.1
 Release:       1
 License:       MIT
 Group:         Applications/Networking
-Source0:       https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d4db13d5965054b0a231bf95285c6cf0
+Source0:       https://github.com/dehydrated-io/dehydrated/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0ebe5185b2c9bd721e95f95962dc377d
 Source1:       httpd.conf
 Source2:       lighttpd.conf
 Source3:       nginx.conf
@@ -19,12 +19,14 @@ Source10:   04-renew.sh
 Source11:      05-ocsp.sh
 Source12:      06-hook.sh
 Source13:      07-contact.sh
-Source14:      hook.sh
-Source15:      hook.functions
-Source16:      hook.custom_functions
-Source17:      hook.global
+Source14:      08-curl.sh
+Source30:      hook.sh
+Source31:      hook.functions
+Source32:      hook.custom_functions
+Source33:      hook.global
+Source34:      sudoers
 Patch0:                tld.patch
-URL:           https://github.com/lukas2511/dehydrated
+URL:           https://github.com/dehydrated-io/dehydrated
 BuildRequires: rpmbuild(macros) >= 1.713
 Requires:      ca-certificates
 Requires:      crondaemon
@@ -34,7 +36,11 @@ Requires:    grep
 Requires:      mktemp
 Requires:      openssl-tools
 Requires:      sed
+Requires:      sudo
 Requires:      webapps
+Requires(postun):      /usr/sbin/groupdel
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
 Suggests:      webserver(access)
 Suggests:      webserver(alias)
 BuildArch:     noarch
@@ -60,8 +66,8 @@ Current features:
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},{/etc/%{name},%{_webapps}/%{name}}/{conf.d,hooks,hooks.d},/etc/cron.d} \
-       $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenges,certs}
+install -d $RPM_BUILD_ROOT{%{_sbindir},{/etc/%{name},%{_webapps}/%{name}}/{conf.d,hooks,hooks.d},/etc/{cron,sudoers}.d} \
+       $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenges,alpn-certs,certs}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/httpd.conf
@@ -71,12 +77,21 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/%{name}/domains.txt
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/%{name}/config
 cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} \
-       %{SOURCE11} %{SOURCE12} %{SOURCE13} \
+       %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
        $RPM_BUILD_ROOT/etc/%{name}/conf.d/
-install -p %{SOURCE14} $RPM_BUILD_ROOT/etc/%{name}/hooks/hook.sh
-cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/%{name}/hooks/functions
-cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/%{name}/hooks/custom_functions
-cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/%{name}/hooks.d/global
+install -p %{SOURCE30} $RPM_BUILD_ROOT/etc/%{name}/hooks/hook.sh
+cp -p %{SOURCE31} $RPM_BUILD_ROOT/etc/%{name}/hooks/functions
+cp -p %{SOURCE32} $RPM_BUILD_ROOT/etc/%{name}/hooks/custom_functions
+cp -p %{SOURCE33} $RPM_BUILD_ROOT/etc/%{name}/hooks.d/global
+cp -p %{SOURCE34} $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
+
+%pre
+%groupadd -g 184 dehydrated
+
+%postun
+if [ "$1" = "0" ]; then
+       %groupremove dehydrated
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,13 +116,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md CHANGELOG LICENSE
+%doc README.md CHANGELOG LICENSE docs/*.md docs/examples/config
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sudoers.d/%{name}
 %dir %attr(750,root,http) %{_webapps}/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{name}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{name}/lighttpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{name}/nginx.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/config
+%dir %attr(755,root,root) /etc/%{name}
 %dir %attr(755,root,root) /etc/%{name}/conf.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/conf.d/*.sh
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/domains.txt
@@ -120,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %attr(751,root,root) /var/lib/%{name}
 %dir %attr(700,root,root) /var/lib/%{name}/accounts
-%dir %attr(700,root,root) /var/lib/%{name}/certs
-# challenges written here, need to be readable by webserver
-%dir %attr(751,root,root) /var/lib/%{name}/acme-challenges
+%dir %attr(750,root,dehydrated) /var/lib/%{name}/alpn-certs
+%dir %attr(750,root,dehydrated) /var/lib/%{name}/certs
+# challenges are written here, need to be readable by webserver
+%dir %attr(751,root,dehydrated) /var/lib/%{name}/acme-challenges