Fix certbot arguments for non intercative mode

Makefile

@@ -2,9 +2,11 @@ NAME = $(shell basename $(PWD))
 VERSION = $(shell git describe | sed 's/-/./g')
 BRANCH = $(shell git branch --show-current)
 
-define rpm_eval
+RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}')
-shell rpm --eval '%{$(1)}'
+RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
-endef
+RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
+RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
+RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
 
 .PHONY: name
 name:
@@ -14,7 +16,7 @@ name:
 version:
 	@echo "$(VERSION)"
 
-$(RPM_SOURCEDIR)/$(NAME)-%.tar.gz: *
+$(RPM_TARBALL_PATH): *
 	git archive --format=tar.gz \
 	            --output="$@" \
 	            --prefix="$(NAME)-$(VERSION)/" \
@@ -22,11 +24,15 @@ $(RPM_SOURCEDIR)/$(NAME)-%.tar.gz: *
 	            "$(BRANCH)"
 
 .PHONY: tarball
-tarball: $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+tarball: $(RPM_TARBALL_PATH)
 
 .PHONY: install
 install:
-	install --directory $(DESTDIR)$(call rpm_eval _sysconfdir)/netoik-rp
+	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp
-	install --target-directory=$(DESTDIR)$(call rpm_eval _sysconfdir)/netoik-rp/ conf/neotik-rp.conf
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/netoik-rp.conf
-	install --target-directory=$(DESTDIR)$(call rpm_eval _sysconfdir)/netoik-rp/ conf/ovh.ini
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/ovh.ini
-	install --target-directory=$(DESTDIR)$(call rpm_eval _unitdir)/ services/netoik-rp.service
+	install --directory $(DESTDIR)$(RPM_UNITDIR)
+	install --target-directory=$(DESTDIR)$(RPM_UNITDIR)/ services/netoik-rp.service
+	install --directory $(DESTDIR)/opt/certbot
+	install --directory $(DESTDIR)$(RPM_SBINDIR)
+	touch $(DESTDIR)$(RPM_SBINDIR)/certbot

netoik-rp.spec

@@ -31,7 +31,7 @@ if [ $1 == 1 ]; then
   %{_bindir}/env python3 -m venv /opt/certbot
   /opt/certbot/bin/pip install --upgrade pip certbot certbot-dns-ovh
 	%{_bindir}/env ln --symbolic --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 certbot certonly --non-interactive	--agree-tos --email samuel.campos@netoik.io --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
 %{_bindir}/env systemctl disable nginx
@@ -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