Add ghost to certbot cli

.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_SBINDIR = $(shell rpm --eval '%{_sbindir}')
 RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
 RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
+RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
+RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
 
 .PHONY: name
 name:
@@ -13,7 +16,7 @@ name:
 version:
 	@echo "$(VERSION)"
 
-$(RPM_SOURCEDIR)/$(NAME)-%.tar.gz: *
+$(RPM_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: $(RPM_TARBALL_PATH)
 
 .PHONY: install
 install:
-	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx
+	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d
-	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx nginx.conf
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d/ conf/security.conf
+	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/certbot
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/certbot/ conf/ovh.ini.tpl

conf/ovh.ini.tpl

@@ -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

conf/security.conf

@@ -0,0 +1,11 @@
+# Configure ssl module
+# See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html 
+include                   /etc/letsencrypt/options-ssl-nginx.conf;
+ssl_certificate           /etc/letsencrypt/live/netoik.io/fullchain.pem;
+ssl_certificate_key       /etc/letsencrypt/live/netoik.io/privkey.pem;
+ssl_dhparam               /etc/letsencrypt/ssl-dhparams.pem;
+
+# Configure headers
+# See: https://nginx.org/en/docs/http/ngx_http_headers_module.html
+add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload;" always;
+

netoik-rp.spec

@@ -1,4 +1,6 @@
-Name:			      %{make name}
+%define debug_package %{nil}
+
+Name:           %(make name)
 Version:        %(make version)
 Release:        1%{?dist}
 Summary:        Netoik Reverse Proxy
@@ -6,9 +8,9 @@ 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,40 @@ Install the reverse proxy called nginx with a predefined configuration and with
 %install
 %make_install
 
+%post
+# On install
+if [ $1 == 1 ]; then
+  # Replace secrets in ovh.ini
+  %{_bindir}/env envsubst < %{_sysconfdir}/certbot/ovh.ini.tpl > %{_sysconfdir}/certbot/ovh.ini
+  %{_bindir}/env chmod 600 %{_sysconfdir}/certbot/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 --force --target-directory %{_sbindir} /opt/certbot/bin/certbot
+  %{_bindir}/env certbot certonly --non-interactive	--agree-tos --email samuel.campos@netoik.io --dns-ovh --dns-ovh-credentials "%{_sysconfdir}/certbot/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
+
+  # Stop nginx to be sure changes are taken in account
+  %{_bindir}/env systemctl stop nginx
+fi
+%{_bindir}/env systemctl enable nginx
+%{_bindir}/env systemctl start nginx
+
+%postun
+# On uninstall
+if [ $1 == 0 ]; then
+  %{_bindir}/env rm --recursive --force /opt/certbot
+  %{_bindir}/env rm --recursive --force %{_sysconfdir}/certbot
+fi
+
 %files
-%attr(644, root, root) /%{_sysconfdir}/nginx/nginx.conf
+%attr(644, root, root) %config %{_sysconfdir}/nginx/conf.d/security.conf
+%attr(755, root, root) %dir %{_sysconfdir}/certbot
+%attr(600, root, root) %config %ghost %{_sysconfdir}/certbot/ovh.ini
+%attr(644, root, root) %{_sysconfdir}/certbot/ovh.ini.tpl
+%attr(755, root, root) %dir %ghost /opt/certbot
+%attr(755, root, root) %ghost %{_sbindir}/certbot
 
 %changelog
-# let's skip this for now
+%autochangelog

nginx.conf

@@ -1,61 +0,0 @@
-# For more information on configuration
-# See: http://nginx.org/en/docs/
-
-# Configure core
-# See: https://nginx.org/en/docs/ngx_core_module.html
-user             nginx;
-worker_processes auto;
-error_log        /var/log/nginx/error.log;
-pid              /run/nginx.pid;
-
-# Load dynamic modules
-# See: /usr/share/doc/nginx/README.dynamic.
-include /usr/share/nginx/modules/*.conf;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    # Configure logs
-    # See: https://nginx.org/en/docs/http/ngx_http_log_module.html
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-    access_log  /var/log/nginx/access.log  main;
-
-    # Configure core
-    # See: https://nginx.org/en/docs/ngx_core_module.html
-    include             /etc/nginx/mime.types;
-    default_type        text/html;
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
-    types_hash_max_size 4096;
-
-    # Configure ssl module
-    # See: https://nginx.org/en/docs/http/ngx_http_ssl_module.html 
-    include                   /etc/letsencrypt/options-ssl-nginx.conf;
-    ssl_certificate           /etc/letsencrypt/live/netoik.io/fullchain.pem;
-    ssl_certificate_key       /etc/letsencrypt/live/netoik.io/privkey.pem;
-    ssl_dhparam               /etc/letsencrypt/ssl-dhparams.pem;
-    ssl_session_cache         shared:SSL:1m;
-    ssl_prefer_server_ciphers on;
-
-    # Configure headers
-    # See: https://nginx.org/en/docs/http/ngx_http_headers_module.html
-    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload;" always;
-
-    # Configure http2
-    # See: https://nginx.org/en/docs/http/ngx_http_v2_module.html
-    http2 on;
-
-    # Configure http3
-    # See: https://nginx.org/en/docs/http/ngx_http_v3_module.html
-    http3 on;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See: http://nginx.org/en/docs/ngx_core_module.html#include
-    include /etc/nginx/conf.d/*.conf;
-}

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