ci: fix upload pkg command

.gitea/workflows/cd.yaml

@@ -7,20 +7,14 @@ on:
 
 jobs:
   build_n_upload:
-    runs-on: linux
+    runs-on: self-hosted
     steps:
-      - name: Git checkout
+      - uses: actions/checkout@v6
-        uses: actions/checkout@v6
         with:
+          fetch-depth: 0
           fetch-tags: true
-      - name: Build tarball
+      - run: make tarball
-        run: make tarball
+      - run: rpmbuild -ba "$(make name).spec"
+      - run: make upload
         env:
-          GIT_REFERENCE: ${{ github.ref }}
+          PKG_TOKEN: ${{ secrets.PKG_TOKEN }}
-      - 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

@@ -7,16 +7,12 @@ on:
 
 jobs:
   lint_n_build:
-    runs-on: linux
+    runs-on: self-hosted
     steps:
-      - name: Git checkout
+      - uses: actions/checkout@v6
-        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
-      - name: Lint shell scripts
+      - run: shellcheck files/sbin/certbot_renew
-        run: shellcheck files/sbin/certbot_renew
+      - run: make tarball
-      - name: Build tarball
+      - run: rpmbuild -ba "$(make name).spec"
-        run: make tarball
-      - name: Build rpm file
-        run: rpmbuild -ba netoik-rp.spec

.gitignore

@@ -1,2 +1,3 @@
 *.swp
 *.env
+/.idea

Makefile

@@ -1,16 +1,21 @@
 NAME = netoik-rp
 VERSION = $(shell git describe --abbrev=0)
 RELEASE = $(shell git rev-parse --short HEAD)
-REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current))
+ARCH = noarch
-BUILD_ARCH = noarch
+OWNER = samuel
+SUMMARY = "Netoïk Reverse Proxy"
+LICENSE = "MIT"
+URL = "https://git.netoik.io/$(OWNER)/$(NAME)"
+SOURCE0 = "$(NAME)-$(VERSION)-$(RELEASE).tar.gz"
 
 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
+RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(SOURCE0)
+RPM_BUILD_PATH = $(RPM_RPMDIR)/$(ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(ARCH).rpm
 
 .PHONY: name
 name:
@@ -24,9 +29,29 @@ version:
 release:
 	@echo "$(RELEASE)"
 
-.PHONY: build_arch
+.PHONY: arch
-build_arch:
+arch:
-	@echo "$(BUILD_ARCH)"
+	@echo "$(ARCH)"
+
+.PHONY: owner
+owner:
+	@echo "$(OWNER)"
+
+.PHONY: summary
+summary:
+	@echo "$(SUMMARY)"
+
+.PHONY: license
+license:
+	@echo "$(LICENSE)"
+
+.PHONY: url
+url:
+	@echo "$(URL)"
+
+.PHONY: source0
+source0:
+	@echo "$(SOURCE0)"
 
 .PHONY: install
 install:
@@ -41,11 +66,11 @@ $(RPM_TARBALL_PATH): *
 	            --output="$@" \
 	            --prefix="$(NAME)-$(VERSION)/" \
 	            --verbose \
-	            "$(REFERENCE)"
+	            HEAD 
 
 .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
+	curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(OWNER):$(PKG_TOKEN)" https://git.netoik.io/api/packages/$(OWNER)/rpm/upload

README.md

@@ -1,3 +1,88 @@
-# netoik-rp
+# Netoïk reverse proxy ![badge](https://git.netoik.io/samuel/netoik-rp/actions/workflows/ci.yaml/badge.svg)
 
-Netoïk reverse proxy
+Build an RPM package which will install several tools.
+
+- `Nginx` with:
+    - ssl settings
+    - security headers
+    - default site configuration
+
+
+- `Certbot` certificates with:
+    - ovh configuration to renew certs
+    - a command tool certbot_renew
+    - a systemctl certbot renew timer
+
+
+# Development
+
+A `Makefile` is integrated to let you run some basic commands.
+
+- To display some information about the project
+  ```shell
+  make name
+  make version
+  make release
+  make build_arch
+  ```
+
+- To build a tarball:
+  ```shell
+  make tarball 
+  ```
+  
+- To build a rpm package:
+  ```shell
+  rpmbuild -ba netoik-rp.spec
+  ```
+  
+- To upload rpm package to Gitea repository
+(env vars `GIT_PACKAGES_USERNAME` and `GIT_PACKAGES_TOKEN` needed):
+  ```shell
+  make upload
+  ```
+
+
+# CI / CD
+
+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
+
+
+- Continuous Delivery:
+  - triggered by each tag pushed
+  - builds tarball
+  - builds and uploads rpm package to `Gitea` repository
+
+
+# Deployment
+
+Some commands to deploy the RPM package on server
+
+- To add Gitea repo to your repo list:
+  ```shell
+  dnf config-manager --add-repo https://git.netoik.io/api/packages/samuel/rpm.repo
+  dnf repolist | grep gitea-samuel
+  ```
+  
+- To show available versions:
+  ```shell
+  dnf --showduplicates netoik-rp
+  ```
+  
+- To install or upgrade:
+  ```shell
+  dnf --nogpgcheck install netoik-rp
+  dnf --nogpgcheck upgrade netoik-rp
+  ```
+
+
+# Security Notes
+
+For security reasons, act runners does not have sudo privileges and so there is:
+- **no** Continuous Deployment because act runners cannot use `dnf`
+- **no** GPG signing because act runners cannot use `gpg`

netoik-rp.spec

@@ -3,12 +3,12 @@
 Name:           %(make name)
 Version:        %(make version)
 Release:        %(make release)
-Summary:        Netoik Reverse Proxy
+Summary:        %(make summary)
-License:        MIT
+License:        %(make license)
-URL:            https://git.netoik.io/samuel/netoik-rp
+URL:            %(make url)
 
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %(make source0)
-Buildarch:      %(make build_arch)
+Buildarch:      %(make arch)
 BuildRequires:  make
 Requires:       nginx python3 python-devel (augeas-devel or augeas-libs) gcc openssl