diff --git a/Makefile b/Makefile index 9f1cfdb..ccfb32d 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ NAME = $(shell basename $(PWD)) VERSION = $(shell git describe | sed 's/-/./g') BRANCH = $(shell git branch --show-current) +RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') @@ -32,3 +33,6 @@ install: install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/ovh.ini install --directory $(DESTDIR)$(RPM_UNITDIR) install --target-directory=$(DESTDIR)$(RPM_UNITDIR)/ services/netoik-rp.service + install --directory $(DESTDIR)/certbot + install --directory $(DESTDIR)$(RPM_SBINDIR) + touch $(DESTDIR)$(RPM_SBINDIR)/certbot diff --git a/netoik-rp.spec b/netoik-rp.spec index e5f596e..8fcfed4 100644 --- a/netoik-rp.spec +++ b/netoik-rp.spec @@ -30,7 +30,7 @@ if [ $1 == 1 ]; then # Create virutal env with certbot cli %{_bindir}/env python3 -m venv /opt/certbot /opt/certbot/bin/pip install --upgrade pip certbot certbot-dns-ovh - %{_bindir}/env ln --symbolic --force -q-target-directory %{_sbindir} /opt/certbot/bin/certbot + %{_bindir}/env ln --symbolic --force --target-directory %{_sbindir} /opt/certbot/bin/certbot %{_bindir}/env certbot certonly --dns-ovh --dns-ovh-credentials "%{_sysconfdir}/%{name}/ovh.ini" -d "*.netoik.io" -d "*.samuel-campos.fr" %{_bindir}/env printf "\nAutomatic certbot renew\n0 12 * * * root sleep $((RANDOM % 3600)) && certbot renew -q\n" >> %{_sysconfdir}/crontab fi @@ -44,6 +44,8 @@ fi %attr(600, root, root) %config %{_sysconfdir}/%{name}/ovh.ini %attr(644, root, root) %config %{_sysconfdir}/%{name}/netoik-rp.conf %attr(644, root, root) %config %{_unitdir}/%{name}.service +%attr(755, root, root) %dir /opt/certbot +%attr(755, root, root) %{_sbindir}/certbot %changelog %autochangelog