Add missing packaged files

.gitea/workflows/ci.yaml

@@ -0,0 +1,13 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  env:
+    runs-on: linux
+    steps:
+      - name: Show env
+        run: env | sort

Makefile

@@ -28,7 +28,7 @@ tarball: $(RPM_TARBALL_PATH)
 
 .PHONY: install
 install:
-	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d
+	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/certbot $(DESTDIR)$(RPM_UNITDIR)
-	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d conf/_security.conf
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d conf/nginx/0_security.conf conf/nginx/default.conf
-	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/certbot
+	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/certbot conf/certbot/ovh.ini
-	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/certbot/ conf/ovh.ini
+	install --target-directory=$(DESTDIR)$(RPM_UNITDIR) conf/systemd/certbot-renew.service conf/systemd/certbot-renew.timer

conf/nginx/0_security.conf

@@ -25,5 +25,3 @@ add_header                   Cross-Origin-Resource-Policy   "same-site"
 add_header                   Permissions-Policy             "geolocation=(), camera=(), microphone=()"                           always;
 add_header                   Server                         "webserver"                                                          always;
 add_header                   X-Robots-Tag                   "noindex, nofollow"                                                  always;
-
-

conf/nginx/default.conf

@@ -0,0 +1,13 @@
+server {
+	listen 443 default_server;
+	server_name _;
+
+	return 404;
+}
+
+server {
+	listen 80 default_server;
+	server_name _;
+
+	return 301 https://$host$request_uri;    
+}

conf/systemd/certbot-renew.service

@@ -0,0 +1,5 @@
+[Unit]
+Description=Renew certbot certificates
+
+[Service]
+ExecStart=sleep $RANDOM && /opt/certbot/bin/pip install --upgrade certbot certbot-nginx certbot-dns-ovh && certbot renew

conf/systemd/certbot-renew.timer

@@ -0,0 +1,8 @@
+[Unit]
+Description=Daily renew certbot certificates
+
+[Timer]
+OnCalendar=Daily
+
+[Install]
+WantedBy=multi-user.target

netoik-rp.spec

@@ -10,7 +10,7 @@ URL:            https://git.netoik.io/samuel/netoik-rp
 Source0:        %{name}-%{version}.tar.gz
 Buildarch:      noarch
 BuildRequires:  make
-Requires:       nginx python3 python-devel augeas-devel gcc openssl
+Requires:       nginx python3 python-devel (augeas-devel or augeas-libs) gcc openssl
 
 %description
 Install the reverse proxy called nginx with a predefined configuration and with TLS certificates attached to netoik.io
@@ -24,30 +24,29 @@ Install the reverse proxy called nginx with a predefined configuration and with
 %post
 # After install
 if [ $1 == 1 ]; then
-  # Replace secrets in ovh.ini
+	# Replace secrets in ovh.ini
-  %{_bindir}/env envsubst < %{_sysconfdir}/certbot/ovh.ini > %{_sysconfdir}/certbot/.ovh.ini.swp
+	%{_bindir}/env envsubst < %{_sysconfdir}/certbot/ovh.ini > %{_sysconfdir}/certbot/.ovh.ini.swp
-  %{_bindir}/env mv %{_sysconfdir}/certbot/.ovh.ini.swp %{_sysconfdir}/certbot/ovh.ini
+	%{_bindir}/env mv %{_sysconfdir}/certbot/.ovh.ini.swp %{_sysconfdir}/certbot/ovh.ini
-  %{_bindir}/env chmod 600 %{_sysconfdir}/certbot/ovh.ini
+	%{_bindir}/env chmod 600 %{_sysconfdir}/certbot/ovh.ini
 
-  # Create virutal env with certbot
+	# Create virutal env with certbot
-  %{_bindir}/env python3 -m venv /opt/certbot
+	%{_bindir}/env python3 -m venv /opt/certbot
-  /opt/certbot/bin/pip install --upgrade pip certbot certbot-nginx certbot-dns-ovh
+	/opt/certbot/bin/pip install --upgrade pip certbot certbot-nginx certbot-dns-ovh
 	%{_bindir}/env ln --symbolic --force --target-directory %{_sbindir} /opt/certbot/bin/certbot
 
-  # Create certificate with certbot
+	# Create certificate with 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 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"
-
-  # Add crontab rule for automatic renew
-  %{_bindir}/env printf "\nAutomatic certbot renew\n0 12 * * * root sleep $((RANDOM % 3600)) && certbot renew -q\n" >> %{_sysconfdir}/crontab
 
   # Create ssl dh params
-  %{_bindir}/env openssl dhparam -out %{_sysconfdir}/letsencrypt/ssl-dhparams.pem
+  %{_bindir}/env openssl dhparam -out %{_sysconfdir}/letsencrypt/ssl-dhparams.pem 2048
 
-  # Stop nginx to be sure changes are taken in account
+  # Stop services to be sure changes are taken in account
-  %{_bindir}/env systemctl stop nginx
+  %{_bindir}/env systemctl stop nginx certbot-renew
 fi
-%{_bindir}/env systemctl enable nginx
+
-%{_bindir}/env systemctl start nginx
+# Start services
+%{_bindir}/env systemctl daemon-reload
+%{_bindir}/env systemctl enable --now nginx certbot-renew
 
 %postun
 # After uninstall
@@ -58,13 +57,19 @@ if [ $1 == 0 ]; then
 fi
 
 %files
-%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/_security.conf
+%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/0_security.conf
+%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/default.conf
+
 %attr(755, root, root) %dir %{_sysconfdir}/certbot
-%attr(600, root, root) %config %{_sysconfdir}/certbot/ovh.ini
+%attr(600, root, root) %{_sysconfdir}/certbot/ovh.ini
+
+%attr(644, root, root) %{_unitdir}/certbot-renew.timer
+%attr(644, root, root) %{_unitdir}/certbot-renew.service
+
 %ghost %attr(755, root, root) %dir /opt/certbot
 %ghost %attr(755, root, root) %{_sbindir}/certbot
 %ghost %attr(755, root, root) %dir %{_sysconfdir}/letsencrypt
-%ghost %attr(755, root, root) %{_sysconfdir}/letsencrypt/ssl-dhparams.pem
+%ghost %attr(644, root, root) %{_sysconfdir}/letsencrypt/ssl-dhparams.pem
 
 %changelog
 %autochangelog