ci: add git ref

.gitea/workflows/cd.yaml

@@ -0,0 +1,26 @@
+name: Continuous Integration
+
+on:
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+  build:
+    runs-on: linux
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+      - name: Build tarball
+        run: make tarball
+        env:
+          GIT_REFERENCE: ${{ github.ref }}
+      - name: Build rpm package
+        run: rpmbuild -ba "$(make name).spec"
+      - name: Upload rpm package
+        run: make upload
+        env:
+          GIT_PACKAGES_USERNAME: ${{ vars.GIT_PACKAGES_USERNAME }}
+          GIT_PACKAGES_TOKEN: ${{ secrets.GIT_PACKAGES_TOKEN }}

.gitea/workflows/ci.yaml

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

Makefile

@@ -1,12 +1,16 @@
-NAME = $(shell basename $(PWD))
+NAME = netoik-rp
-VERSION = $(shell git describe | sed 's/-/./g')
+VERSION = $(shell git describe --always --tags --abbrev=0)
-BRANCH = $(shell git branch --show-current)
+RELEASE = $(shell git rev-parse --short HEAD)
+REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current))
+BUILD_ARCH = noarch
 
+RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}')
 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
+RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 
 .PHONY: name
 name:
@@ -16,15 +20,13 @@ name:
 version:
 	@echo "$(VERSION)"
 
-$(RPM_TARBALL_PATH): *
+.PHONY: release
-	git archive --format=tar.gz \
+release:
-	            --output="$@" \
+	@echo "$(RELEASE)"
-	            --prefix="$(NAME)-$(VERSION)/" \
-	            --verbose \
-	            "$(BRANCH)"
 
-.PHONY: tarball
+.PHONY: build_arch
-tarball: $(RPM_TARBALL_PATH)
+build_arch:
+	@echo "$(BUILD_ARCH)"
 
 .PHONY: install
 install:
@@ -33,3 +35,17 @@ install:
 	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
+
+$(RPM_TARBALL_PATH): *
+	git archive --format=tar.gz \
+	            --output="$@" \
+	            --prefix="$(NAME)-$(VERSION)/" \
+	            --verbose \
+	            "$(REFERENCE)"
+
+.PHONY: tarball
+tarball: $(RPM_TARBALL_PATH)
+
+.PHONY: upload
+upload:
+	curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(GIT_PACKAGES_USERNAME):$(GIT_PACKAGES_TOKEN)" https://git.netoik.io/api/packages/samuel/rpm/upload

files/nginx/0_security.conf

@@ -14,14 +14,17 @@ resolver                     127.0.0.1;
 
 # Add some basic security headers from OWASP
 # see: https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Headers_Cheat_Sheet.html
-add_header                   Strict-Transport-Security      "max-age=63072000; includeSubDomains; preload;"                      always;
+# And Nextcloud doc
-add_header                   X-Frame-Options                "DENY"                                                               always;
+# see: https://docs.nextcloud.com/server/31/admin_manual/installation/harden_server.html
-add_header                   X-XSS-Protection               "0"                                                                  always;
+add_header                   Strict-Transport-Security            "max-age=63072000; includeSubDomains; preload;"                                      always;
-add_header                   X-Content-Type-Options         "nosniff"                                                            always;
+add_header                   X-Frame-Options                      "sameorigin"                                                                         always;
-add_header                   Referrer-Policy                "strict-origin-when-cross-origin"                                    always;
+add_header                   X-XSS-Protection                     "1;mode=block"                                                                       always;
-add_header                   Content-Security-Policy        "default-src 'self'; frame-ancestors 'self'; form-action 'self';"    always;
+add_header                   X-Content-Type-Options               "nosniff"                                                                            always;
-add_header                   Cross-Origin-Opener-Policy     "same-origin"                                                        always;
+add_header                   X-Permitted-Cross-Domain-Policies    "none"                                                                               always;
-add_header                   Cross-Origin-Resource-Policy   "same-site"                                                          always;
+add_header                   Referrer-Policy                      "strict-origin-when-cross-origin"                                                    always;
-add_header                   Permissions-Policy             "geolocation=(), camera=(), microphone=()"                           always;
+add_header                   Content-Security-Policy              "default-src 'self' 'unsafe-inline'; frame-ancestors 'self'; form-action 'self';"    always;
-add_header                   Server                         "webserver"                                                          always;
+add_header                   Cross-Origin-Opener-Policy           "same-origin"                                                                        always;
-add_header                   X-Robots-Tag                   "noindex, nofollow"                                                  always;
+add_header                   Cross-Origin-Resource-Policy         "same-site"                                                                          always;
+add_header                   Permissions-Policy                   "geolocation=(), camera=(), microphone=()"                                           always;
+add_header                   Server                               "webserver"                                                                          always;
+add_header                   X-Robots-Tag                         "noindex, nofollow"                                                                  always;

files/sbin/certbot_renew

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-/usr/bin/env sleep $(($RANDOM % 3600));
+sleep $(($RANDOM % 3600));
 /opt/certbot/bin/pip install --upgrade certbot certbot-nginx certbot-dns-ovh
-/usr/bin/env certbot renew --cert-name netoik.io
+certbot renew --cert-name netoik.io

netoik-rp.spec

@@ -2,13 +2,13 @@
 
 Name:           %(make name)
 Version:        %(make version)
-Release:        1%{?dist}
+Release:        %(make release)
 Summary:        Netoik Reverse Proxy
 License:        MIT
 URL:            https://git.netoik.io/samuel/netoik-rp
 
 Source0:        %{name}-%{version}.tar.gz
-Buildarch:      noarch
+Buildarch:      %(make build_arch)
 BuildRequires:  make
 Requires:       nginx python3 python-devel (augeas-devel or augeas-libs) gcc openssl
 
@@ -55,7 +55,7 @@ systemctl reenable --now nginx.service certbot-renew.timer
 %postun
 # Remove folders after uninstall
 if [ $1 == 0 ]; then
-  /opt/certbot/bin/certbot delete --cert-name netoik.io
+  /opt/certbot/bin/certbot delete --cert-name netoik.io --non-interactive
 	rm --recursive --force /opt/certbot
   rm --recursive --force %{_sysconfdir}/certbot
 fi