Fix makefile fuction

.gitignore

@@ -1 +1,2 @@
 *.swp
+*.env

Makefile

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

conf/ovh.ini

@@ -0,0 +1,6 @@
+# OVH API credentials used by Certbot
+# Name referenced in OVH: rasp.netoik.io
+dns_ovh_endpoint = $DNS_OVH_ENDPOINT
+dns_ovh_application_key = $DNS_OVH_APPLICATION_KEY
+dns_ovh_application_secret = $DNS_OVH_APPLICATION_SECRET
+dns_ovh_consumer_key = $DNS_OVH_CONSUMER_KEY

netoik-rp.spec

@@ -1,14 +1,16 @@
-Name:			      %{make name}
+%define debug_package %{nil}
-Version:	      %(make version)
+
-Release:	      1%{?dist}
+Name:           %(make name)
-Summary:	      Netoik Reverse Proxy
+Version:        %(make version)
-License:	      MIT
+Release:        1%{?dist}
+Summary:        Netoik Reverse Proxy
+License:        MIT
 URL:            https://git.netoik.io/samuel/netoik-rp
 
 Source0:        %{name}-%{version}.tar.gz
-Buildarch:      x86_64
+Buildarch:      noarch
 BuildRequires:  make
-Requires:       nginx
+Requires:       nginx,python3,python-devel,augeas-devel,gcc
 
 %description
 Install the reverse proxy called nginx with a predefined configuration and with TLS certificates attached to netoik.io
@@ -19,8 +21,29 @@ Install the reverse proxy called nginx with a predefined configuration and with
 %install
 %make_install
 
+%post
+if [ $1 == 1 ]; then
+  # Replace secrets in ovh.ini
+  %{_bindir}/env envsubst < %{_sysconfdir}/%{name}/ovh.ini > %{_sysconfdir}/%{name}/ovh.ini.tmp
+  %{_bindir}/env mv %{_sysconfdir}/%{name}/ovh.ini.tmp %{_sysconfdir}/%{name}/ovh.ini
+  
+  # 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 --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
+%{_bindir}/env systemctl disable nginx
+%{_bindir}/env systemctl stop nginx
+%{_bindir}/env systemctl enable %{name}
+%{_bindir}/env systemctl start %{name}
+
 %files
-%attr(644, root, root) /%{_sysconfdir}/nginx/nginx.conf
+%attr(755, root, root) %dir %{_sysconfdir}/%{name}
+%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
 
 %changelog
-# let's skip this for now
+%autochangelog

services/netoik-rp.service

@@ -0,0 +1,14 @@
+[Service]
+Type=forking
+PIDFile=/run/netoik-rp.pid
+ExecStartPre=/usr/bin/env rm -f /run/netoik-rp.pid
+ExecStartPre=/usr/bin/env nginx -t -c /etc/netoik-rp/netoik-rp.conf
+ExecStart=/usr/bin/env nginx -c /etc/netoik-rp/netoik-rp.conf
+ExecReload=/usr/bin/env nginx -s reload -c /etc/netoik-rp/netoik-rp.conf
+KillSignal=SIGQUIT
+TimeoutStopSec=5
+KillMode=mixed
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target