diff --git a/acme-tiny.spec b/acme-tiny.spec index 0b0356d..44600f7 100644 --- a/acme-tiny.spec +++ b/acme-tiny.spec @@ -19,8 +19,8 @@ Release: 4%{?dist} Summary: Tiny auditable script to issue, renew Let's Encrypt certificates License: MIT -URL: https://github.com/diafygi/acme-tiny -Source0: https://github.com/diafygi/acme-tiny/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +URL: https://github.com/diafygi/%{name} +Source0: https://github.com/diafygi/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: acme-tiny-sign.sh Source2: cert-check.py Source3: acme.conf @@ -95,17 +95,17 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libexecdir}/%{name} mkdir -p %{buildroot}%{_sharedstatedir}/acme/{private,csr,certs} -mkdir -p %{buildroot}%{_sysconfdir}/acme/notify.d +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/notify.d chmod 0700 %{buildroot}%{_sharedstatedir}/acme/private install -m 0755 acme-tiny-sign.sh %{buildroot}%{_libexecdir}/%{name}/sign install -m 0755 acme_tiny.py %{buildroot}%{_sbindir}/acme_tiny -ln -sf acme_tiny %{buildroot}%{_sbindir}/acme-tiny +ln -sf acme_tiny %{buildroot}%{_sbindir}/%{name} ln -sf %{_libexecdir}/%{name}/sign %{buildroot}%{_sbindir}/acme-tiny-sign install -m 0755 cert-check.py %{buildroot}%{_sbindir}/cert-check install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d install -m 0644 %{SOURCE4} %{buildroot}%{_sharedstatedir}/acme -install -m 0755 %{SOURCE9} %{buildroot}%{_sysconfdir}/acme +install -m 0755 %{SOURCE9} %{buildroot}%{_sysconfdir}/%{name} %if %{use_systemd} mkdir -p %{buildroot}%{_unitdir} install -pm 644 %{SOURCE6} %{buildroot}%{_unitdir} @@ -146,11 +146,12 @@ exit 0 %if %{use_systemd} %{_unitdir}/* %else -%config(noreplace) %{_sysconfdir}/cron.d/acme-tiny +%config(noreplace) %{_sysconfdir}/cron.d/%{name} %endif %{_sbindir}/acme-tiny-sign %{_sbindir}/cert-check -%{_sbindir}/acme-tiny +%{_sbindir}/%{name} +%{_sysconfdir}/%{name} %files core %license LICENSE diff --git a/notify.sh b/notify.sh index d027247..2d04011 100755 --- a/notify.sh +++ b/notify.sh @@ -2,7 +2,7 @@ cert="$1" name="${cert##*/}" -script="/etc/acme/notify.d/${name%.crt}.sh" +script="/etc/acme-tiny/notify.d/${name%.crt}.sh" # kick apache if cert is mentioned if grep "$cert" /etc/httpd/conf.d/*.conf >/dev/null 2>&1; then