X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=dehydrated.spec;h=3a25b89a1105629ecc9e3399234b7a9e441b024a;hb=75b6ad1cd661e9e0c9c5617b871603ecdfcb6ab0;hp=cb6c8219a17360e7064151eb906b2fec209da66d;hpb=6548e56fe28433ca29eca0b69708ffcffe41cdfb;p=packages%2Fdehydrated.git

diff --git a/dehydrated.spec b/dehydrated.spec
index cb6c821..3a25b89 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,12 +1,12 @@
 Summary:	letsencrypt/acme client implemented as a shell-script
 Name:		dehydrated
-Version:	0.4.0
-Release:	0.2
+Version:	0.6.2
+Release:	4
 License:	MIT
 Group:		Applications/Networking
 Source0:	https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	8114ba0144a158d5ad1bdf02e6f43195
-Source1:	apache.conf
+# Source0-md5:	d4db13d5965054b0a231bf95285c6cf0
+Source1:	httpd.conf
 Source2:	lighttpd.conf
 Source3:	nginx.conf
 Source4:	domains.txt
@@ -21,7 +21,9 @@ Source12:	06-hook.sh
 Source13:	07-contact.sh
 Source14:	hook.sh
 Source15:	hook.functions
-Source16:	hook.global
+Source16:	hook.custom_functions
+Source17:	hook.global
+Source18:	sudoers
 Patch0:		tld.patch
 URL:		https://github.com/lukas2511/dehydrated
 BuildRequires:	rpmbuild(macros) >= 1.713
@@ -33,7 +35,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
@@ -59,11 +65,11 @@ 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} \
+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,certs}
 
 install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/apache.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{name}/httpd.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{name}/lighttpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_webapps}/%{name}/nginx.conf
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/%{name}/domains.txt
@@ -74,16 +80,26 @@ cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} \
 	$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.d/global
+cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/%{name}/hooks/custom_functions
+cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/%{name}/hooks.d/global
+cp -p %{SOURCE18} $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
 
 %triggerin -- apache < 2.2.0, apache-base
-%webapp_register apache %{name}
+%webapp_register httpd %{name}
 
 %triggerun -- apache < 2.2.0, apache-base
-%webapp_unregister apache %{name}
+%webapp_unregister httpd %{name}
 
 %triggerin -- lighttpd
 %webapp_register lighttpd %{name}
@@ -101,22 +117,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG LICENSE
 %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}/apache.conf
+%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
-%attr(755,root,root) /etc/%{name}/conf.d
+%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
-%attr(755,root,root) /etc/%{name}/hooks
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/hooks/functions
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/hooks/hook.sh
-%attr(755,root,root) /etc/%{name}/hooks.d
+%dir %attr(755,root,root) /etc/%{name}/hooks
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/hooks/custom_functions
+%attr(640,root,root) /etc/%{name}/hooks/functions
+%attr(750,root,root) /etc/%{name}/hooks/hook.sh
+%dir %attr(755,root,root) /etc/%{name}/hooks.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/%{name}/hooks.d/global
 %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
+%dir %attr(750,root,dehydrated) /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(751,root,dehydrated) /var/lib/%{name}/acme-challenges