doc: update badge

Makefile

@@ -2,7 +2,7 @@ NAME = netoik-rp
 VERSION = $(shell git describe --abbrev=0)
 RELEASE = $(shell git rev-parse --short HEAD)
 ARCH = noarch
-OWNER = samuel
+OWNER = netoik
 SUMMARY = "Netoïk Reverse Proxy"
 LICENSE = "MIT"
 URL = "https://git.netoik.io/$(OWNER)/$(NAME)"
@@ -73,8 +73,8 @@ install:  ## Install files into rpm dest (requires env var DESTDIR)
 		printf "[CRITICAL] Missing env var DESTDIR\n[CRITICAL] This command is designed to be called by rpmbuild only!\n" 1>&2; \
 		exit 1; \
 	fi
-	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/certbot $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SBINDIR)
-	install --mode=755 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d files/nginx/0_security.conf files/nginx/z_default.conf
+	install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/certbot $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SBINDIR)
+	install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d files/nginx/0_security.conf files/nginx/z_default.conf
 	install --mode=600 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/certbot files/certbot/ovh.ini
 	install --mode=644 --target-directory=$(DESTDIR)$(RPM_UNITDIR) files/systemd/certbot-renew.service files/systemd/certbot-renew.timer
 	install --mode=755 --target-directory=$(DESTDIR)$(RPM_SBINDIR) files/sbin/certbot_renew

README.md

@@ -1,4 +1,4 @@
-# Netoïk reverse proxy ![badge](https://git.netoik.io/samuel/netoik-rp/actions/workflows/ci.yaml/badge.svg)
+# Netoïk reverse proxy ![badge](https://git.netoik.io/netoik/netoik-rp/actions/workflows/ci.yaml/badge.svg)
 
 Build an RPM package which will install several tools.
 
@@ -48,15 +48,16 @@ A `Makefile` is integrated to let you run some basic commands.
 Two workflows are set up.
 
 - Continuous Integration:
-  - triggered by each push on branch `main`
-  - runs shellcheck on script `certbot_renew`
-  - builds tarball and rpm package to test everything is OK
-
+  - triggered by each push event on branch `main`
+  - runs shellcheck
+  - builds tarball
+  - builds rpm package
 
 - Continuous Delivery:
-  - triggered by each tag pushed
+  - triggered by each tag push event
   - builds tarball
-  - builds and uploads rpm package to `Gitea` repository
+  - builds rpm package
+  - uploads rpm package to repository
 
 
 # Deployment
@@ -65,13 +66,13 @@ Some commands to deploy the RPM package on server
 
 - Add Gitea repo to your repo list:
   ```shell
-  dnf config-manager --add-repo https://git.netoik.io/api/packages/samuel/rpm.repo
+  dnf config-manager --add-repo https://git.netoik.io/api/packages/netoik/rpm.repo
   dnf repolist | grep gitea-samuel
   ```
 
 - Show available versions:
   ```shell
-  dnf --showduplicates netoik-rp
+  dnf search --showduplicates netoik-rp
   ```
 
 - Create certbot ovh credentials here: 
@@ -97,6 +98,11 @@ Some commands to deploy the RPM package on server
   set +a
   ```
 
+- Install or upgrade without certbot (for testing environment)
+  ```shell
+  SKIP_CERTBOT=true dnf --nogpgcheck --refresh --assumeyes --best install netoik-rp
+  ```
+
 
 # Security Notes
 

files/systemd/certbot-renew.service

@@ -2,4 +2,4 @@
 Description=Renew certbot certificates
 
 [Service]
-ExecStart=certbot_renew
+ExecStart=/usr/sbin/certbot_renew

netoik-rp.spec

@@ -22,14 +22,19 @@ Install the reverse proxy called nginx with a predefined configuration and with
 %make_install
 
 %post
+if [ -z $SKIP_CERTBOT ]; then
+	# Check required OVH variables
+	if [ -z $OVH_ENDPOINT ]; then echo "Missing env var OVH_ENDPOINT!" 1>&2; exit 1; fi
+	if [ -z $OVH_APPLICATION_NAME ]; then echo "Missing env var OVH_APPLICATION_KEY!" 1>&2; exit 1; fi
+	if [ -z $OVH_APPLICATION_DESCRIPTION ]; then echo "Missing env var OVH_APPLICATION_DESCRIPTION!" 1>&2; exit 1; fi
+	if [ -z $OVH_APPLICATION_KEY ]; then echo "Missing env var OVH_APPLICATION_KEY!" 1>&2; exit 1; fi
+	if [ -z $OVH_APPLICATION_SECRET ]; then echo "Missing env var OVH_APPLICATION_SECRET!" 1>&2; exit 1; fi
+	if [ -z $OVH_CONSUMER_KEY ]; then echo "Missing env var OVH_CONSUMER_KEY!" 1>&2; exit 1; fi
+
 	# Replace secrets in ovh.ini
 	envsubst < %{_sysconfdir}/certbot/ovh.ini > %{_sysconfdir}/certbot/.ovh.ini.new
-if cmp --silent %{_sysconfdir}/certbot/.ovh.ini.new %{_sysconfdir}/certbot/ovh.ini; then
-	rm %{_sysconfdir}/certbot/.ovh.ini.new
-else
 	mv %{_sysconfdir}/certbot/.ovh.ini.new %{_sysconfdir}/certbot/ovh.ini
 	chmod 600 %{_sysconfdir}/certbot/ovh.ini
-fi
 
 	# Create virtualenv with certot
 	if [ ! -d "/opt/certbot" ]; then
@@ -42,6 +47,11 @@ fi
 	if ! certbot certificates --cert-name netoik.io | grep --quiet netoik.io; then
 		certbot certonly --cert-name netoik.io --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
 	fi
+else
+	# Skipping certbot, so create self-signed certificate
+	mkdir --parents /etc/letsencrypt/live/netoik.io
+	openssl req -newkey rsa:4096 -nodes -keyout /etc/letsencrypt/live/netoik.io/privkey.pem -x509 -days 365 -out /etc/letsencrypt/live/netoik.io/fullchain.pem -subj "/C=US/ST=State/L=City/O=Organization/OU=Department/CN=netoik.io"
+fi
 
 # Create ssl dh params if not already exists
 if [ ! -f "%{_sysconfdir}/letsencrypt/ssl-dhparams.pem" ]; then