fix: make install rights

Makefile

@@ -17,50 +17,46 @@ RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
 RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(SOURCE0)
 RPM_BUILD_PATH = $(RPM_RPMDIR)/$(ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(ARCH).rpm
 
+.PHONY: help
+help:
+	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
 .PHONY: name
-name:
+name:  ## Show project name
 	@echo "$(NAME)"
 
 .PHONY: version
-version:
+version:  ## Show current project version
 	@echo "$(VERSION)"
 
 .PHONY: release
-release:
+release:  ## Show current project release
 	@echo "$(RELEASE)"
 
 .PHONY: arch
-arch:
+arch:  ## Show rpm arch target
 	@echo "$(ARCH)"
 
 .PHONY: owner
-owner:
+owner:  ## Show project owner name
 	@echo "$(OWNER)"
 
 .PHONY: summary
-summary:
+summary:  ## Show project summary
 	@echo "$(SUMMARY)"
 
 .PHONY: license
-license:
+license:  ## Show project license
 	@echo "$(LICENSE)"
 
 .PHONY: url
-url:
+url:  ## Show project homepage URL
 	@echo "$(URL)"
 
 .PHONY: source0
-source0:
+source0:  ## Show rpm source0 file name
 	@echo "$(SOURCE0)"
 
-.PHONY: install
-install:
-	install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_SYSCONFDIR)/certbot $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SBINDIR)
-	install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d files/nginx/0_security.conf files/nginx/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
-
 $(RPM_TARBALL_PATH): *
 	git archive --format=tar.gz \
 	            --output="$@" \
@@ -69,8 +65,24 @@ $(RPM_TARBALL_PATH): *
 	            HEAD 
 
 .PHONY: tarball
-tarball: $(RPM_TARBALL_PATH)
+tarball: $(RPM_TARBALL_PATH)  ## Build rpm tarball
+
+.PHONY: install
+install:  ## Install files into rpm dest (requires env var DESTDIR)
+	@if [ -z "$(DESTDIR)" ]; then \
+		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 --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
 
 .PHONY: upload
-upload:
+upload:  ## Upload rpm package to Gitea repository (requires env var PKG_TOKEN)
+	@if [ -z "$(PKG_TOKEN)" ]; then \
+		printf "[CRITICAL] Missing env var PKG_TOKEN\n[CRITICAL] This command is designed to be called by Gitea Actions only!\n" 1>&2; \
+		exit 1; \
+	fi
 	curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(OWNER):$(PKG_TOKEN)" https://git.netoik.io/api/packages/$(OWNER)/rpm/upload

README.md

@@ -18,26 +18,26 @@ Build an RPM package which will install several tools.
 
 A `Makefile` is integrated to let you run some basic commands.
 
-- To display some information about the project
+- Display some information about the project
   ```shell
+  make help
   make name
   make version
   make release
-  make build_arch
+  make arch
   ```
 
-- To build a tarball:
+- Build a tarball:
   ```shell
   make tarball 
   ```
   
-- To build a rpm package:
+- Build an rpm package:
   ```shell
   rpmbuild -ba netoik-rp.spec
   ```
   
-- To upload rpm package to Gitea repository
+- Upload rpm package to Gitea repository (env var `PKG_TOKEN` is required):
-(env vars `GIT_PACKAGES_USERNAME` and `GIT_PACKAGES_TOKEN` needed):
   ```shell
   make upload
   ```
@@ -48,36 +48,54 @@ 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`
+  - triggered by each push event on branch `main`
-  - runs shellcheck on script `certbot_renew`
+  - runs shellcheck
-  - builds tarball and rpm package to test everything is OK
+  - 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
 
 Some commands to deploy the RPM package on server
 
-- To add Gitea repo to your repo list:
+- 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:
+- Show available versions:
   ```shell
   dnf --showduplicates netoik-rp
   ```
 
-- To install or upgrade:
+- Create certbot ovh credentials here: 
+  [www.ovh.com/auth/api/createToken](https://www.ovh.com/auth/api/createToken)
+
+- Setup environemnt file (fill values):
   ```shell
-  dnf --nogpgcheck install netoik-rp
+  cat > ~/.netoik-rp.env << EOF
-  dnf --nogpgcheck upgrade netoik-rp
+  OVH_ENDPOINT=""
+  OVH_APPLICATION_NAME=""
+  OVH_APPLICATION_DESCRIPTION=""
+  OVH_APPLICATION_KEY=""
+  OVH_APPLICATION_SECRET=""
+  OVH_CONSUMER_KEY=""
+  EOF
+  ```
+
+- Install or upgrade package:
+  ```shell
+  set -a
+  source ~/.netoik-rp.env
+  dnf --nogpgcheck --refresh --assumeyes --best install netoik-rp
+  set +a
   ```
 
 

files/certbot/ovh.ini

@@ -1,5 +1,5 @@
 # OVH API credentials used by Certbot
-# To generate a new token, go to: https://www.ovh.com/auth/api/createToken
+# To generate new credentials, go to: https://www.ovh.com/auth/api/createToken
 
 dns_ovh_endpoint = "$OVH_ENDPOINT"
 dns_ovh_application_name = "$OVH_APPLICATION_NAME"

files/nginx/0_security.conf

@@ -22,7 +22,7 @@ add_header                   X-XSS-Protection                     "1;mode=block"
 add_header                   X-Content-Type-Options               "nosniff"                                                                            always;
 add_header                   X-Permitted-Cross-Domain-Policies    "none"                                                                               always;
 add_header                   Referrer-Policy                      "strict-origin-when-cross-origin"                                                    always;
-add_header                   Content-Security-Policy              "default-src 'self' 'unsafe-inline'; frame-ancestors 'self'; form-action 'self';"    always;
+add_header                   Content-Security-Policy              "default-src 'self' 'unsafe-inline' data:; frame-ancestors 'self'; form-action 'self';"    always;
 add_header                   Cross-Origin-Opener-Policy           "same-origin"                                                                        always;
 add_header                   Cross-Origin-Resource-Policy         "same-site"                                                                          always;
 add_header                   Permissions-Policy                   "geolocation=(), camera=(), microphone=()"                                           always;

netoik-rp.spec

@@ -50,7 +50,8 @@ fi
 
 # Restart services
 systemctl daemon-reload
-systemctl reenable --now nginx.service certbot-renew.timer
+systemctl reenable nginx.service certbot-renew.timer
+systemctl restart nginx.service certbot-renew.timer
 
 %postun
 # Remove folders after uninstall
@@ -62,7 +63,7 @@ fi
 
 %files
 %attr(644, root, root) %{_sysconfdir}/nginx/conf.d/0_security.conf
-%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/default.conf
+%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/z_default.conf
 
 %attr(755, root, root) %dir %{_sysconfdir}/certbot
 %attr(600, root, root) %{_sysconfdir}/certbot/ovh.ini