- fix files

[packages/dehydrated.git] / dehydrated.spec

diff --git a/dehydrated.spec b/dehydrated.spec
index cb6c8219a17360e7064151eb906b2fec209da66d..3d22410ef38324a18e9ee10e016ae37d9b5a9825 100644 (file)
--- 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:       2
 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,8 @@ Source12:     06-hook.sh
 Source13:      07-contact.sh
 Source14:      hook.sh
 Source15:      hook.functions
-Source16:      hook.global
+Source16:      hook.custom_functions
+Source17:      hook.global
 Patch0:                tld.patch
 URL:           https://github.com/lukas2511/dehydrated
 BuildRequires: rpmbuild(macros) >= 1.713
@@ -63,7 +64,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},{/etc/%{name},%{_webapps}/%{name}}/{conf.
        $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 +75,17 @@ 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
 
 %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}
@@ -102,17 +104,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md CHANGELOG LICENSE
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.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}