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)"

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.
 
@@ -66,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: 
@@ -98,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,25 +22,35 @@ Install the reverse proxy called nginx with a predefined configuration and with
 %make_install
 
 %post
-# Replace secrets in ovh.ini
+if [ -z $SKIP_CERTBOT ]; then
-envsubst < %{_sysconfdir}/certbot/ovh.ini > %{_sysconfdir}/certbot/.ovh.ini.new
+	# Check required OVH variables
-if cmp --silent %{_sysconfdir}/certbot/.ovh.ini.new %{_sysconfdir}/certbot/ovh.ini; then
+	if [ -z $OVH_ENDPOINT ]; then echo "Missing env var OVH_ENDPOINT!" 1>&2; exit 1; fi
-	rm %{_sysconfdir}/certbot/.ovh.ini.new
+	if [ -z $OVH_APPLICATION_NAME ]; then echo "Missing env var OVH_APPLICATION_KEY!" 1>&2; exit 1; fi
-else
+	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
 	mv %{_sysconfdir}/certbot/.ovh.ini.new %{_sysconfdir}/certbot/ovh.ini
 	chmod 600 %{_sysconfdir}/certbot/ovh.ini
-fi
 
-# Create virtualenv with certot
+	# Create virtualenv with certot
-if [ ! -d "/opt/certbot" ]; then
+	if [ ! -d "/opt/certbot" ]; then
 		python3 -m venv /opt/certbot
 		/opt/certbot/bin/pip install --upgrade pip certbot certbot-nginx certbot-dns-ovh
 		ln --symbolic --force --target-directory %{_sbindir} /opt/certbot/bin/certbot
-fi
+	fi
 
-# Create certbot certificates
+	# Create certbot certificates
-if ! certbot certificates --cert-name netoik.io | grep --quiet netoik.io; then
+	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