fix: remove wget output

Makefile

@@ -2,7 +2,7 @@ NAME = netoik-git
 VERSION = $(shell git describe --abbrev=0)
 RELEASE = $(shell git rev-parse --short HEAD)
 REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current))
-BUILD_ARCH = noarch
+ARCH = noarch
 
 RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}')
 RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}')
@@ -11,7 +11,7 @@ RPM_SHAREDSTATEDIR = $(shell rpm --eval '%{_sharedstatedir}')
 RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
 RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
 
-RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
+RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION)-$(RELEASE).tar.gz
 RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 
 .PHONY: name
@@ -26,14 +26,15 @@ version:
 release:
 	@echo "$(RELEASE)"
 
-.PHONY: build_arch
+.PHONY: arch
-build_arch:
+arch:
-	@echo "$(BUILD_ARCH)"
+	@echo "$(ARCH)"
 
 .PHONY: install
 install:
-	install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/gitea $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SHAREDSTATEDIR)/actrunners
+	install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/gitea $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SHAREDSTATEDIR)/actrunners
-	install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/gitea files/gitea/app.ini
+	install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d/ files/nginx/git.netoik.io.conf
+	install --mode=640 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/gitea files/gitea/app.ini
 	install --mode=644 --target-directory=$(DESTDIR)$(RPM_UNITDIR) files/systemd/gitea.service files/systemd/actrunner@.service
 
 $(RPM_TARBALL_PATH): *

files/nginx/git.netoik.io.conf

@@ -0,0 +1,9 @@
+server {
+  listen 443 ssl;
+  server_name git.netoik.io;
+
+  location / {
+    proxy_pass http://127.0.0.1:3000;
+  }
+}
+

files/systemd/actrunner@.service

@@ -7,7 +7,7 @@ After=network.target gitea.service
 ExecStartPre=/usr/bin/rpmdev-setuptree
 ExecStart=/usr/local/bin/act_runner daemon
 ExecReload=/bin/kill -s HUP $MAINPID
-WorkingDirectory=/opt/actrunners/actrunner%i
+WorkingDirectory=/var/lib//actrunners/actrunner%i
 TimeoutSec=0
 RestartSec=10
 Restart=always

netoik-git.spec

@@ -7,10 +7,10 @@ Summary:        Netoik Reverse Proxy
 License:        MIT
 URL:            https://git.netoik.io/samuel/%(make name)
 
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}-%{release}.tar.gz
-Buildarch:      %(make build_arch)
+Buildarch:      %(make arch)
 BuildRequires:  make
-Requires:       netoik-db netoik-cache git
+Requires:       netoik-rp netoik-db netoik-cache git
 
 %description
 Install the Git UI server called Gitea.
@@ -23,27 +23,33 @@ Install the Git UI server called Gitea.
 
 %post
 # Download gitea bin and verify gpg signature
-wget --output-document %{_tmppath}/gitea "$GITEA_BIN_URL"
+wget --quiet --output-document %{_tmppath}/gitea "$GITEA_BIN_URL"
-wget --output-document %{_tmppath}/gitea.asc "$GITEA_ASC_URL"
+wget --quiet --output-document %{_tmppath}/gitea.asc "$GITEA_ASC_URL"
 gpg --keyserver "$GITEA_GPG_KEYSERVER" --recv "$GITEA_GPG_RECV"
 gpg --verify %{_tmppath}/gitea.asc %{_tmppath}/gitea
 mv %{_tmppath}/gitea %{_sbindir}
 chmod 755 %{_sbindir}/gitea
 rm %{_tmppath}/gitea.asc
 
-# Create gitea user
-useradd --system --create-home --bade-dir %{_sharedstatedir} gitea
-runuser --user gitea -- mkdir --parents %{_sharedstatedir}/gitea/{data,custom}
-
 # Generate internal token and secret key
 INTERNAL_TOKEN="$(gitea generate secret INTERNAL_TOKEN)"
 SECRET_KEY="$(gitea generate secret SECRET_KEY)"
 envsubst < %{_sysconfdir}/gitea/app.ini > %{_sysconfdir}/gitea/app.ini.new
 mv %{_sysconfdir}/gitea/app.ini.new %{_sysconfdir}/gitea/app.ini
-chmod 600 %{_sysconfdir}/gitea/app.ini
+
+# Create gitea user
+useradd --system --create-home --bade-dir %{_sharedstatedir} gitea
+runuser --user gitea -- mkdir --parents %{_sharedstatedir}/gitea/{data,custom}
+chgrp gitea %{_sysconfdir}/gitea/app.ini
+
+# Start gitea and nginx services
+systemctl daemon-reload
+systemctl reenable gitea.service
+systemctl restart gitea.service
+systemctl restart nginx.service
 
 # Create actrunners
-for i in $(seq 1 $ACT_RUNNERS); do
+for i in $(seq 1 $GITEA_ACT_RUNNERS); do
   if ! id "actrunner$i"; then
     useradd --system --create-home --base-dir %{_sharedstatedir}/actrunners "actrunner$i"
     systemctl daemon-reload
@@ -52,25 +58,22 @@ for i in $(seq 1 $ACT_RUNNERS); do
   fi
 done
 
-# Start gitea service
-systemctl daemon-reload
-systemctl reenable gitea.service
-systemctl restart gitea.service
-
 %preun
 # Backup gitea data in case of problem
-gitea dump --config %{_sysconfdir}/gitea/app.ini --tempdir %{_tmppath}
+runuser --user gitea -- gitea dump --config %{_sysconfdir}/gitea/app.ini --tempdir %{_tmppath}
 
 %postun
 # Remove gitea user after uninstall
-if [ %1 == 0 ]; then
+#if [ %1 == 0 ]; then
-	systemctl stop gitea.service
+#	systemctl stop gitea.service
-  userdel --force --remove gitea
+#  userdel --force --remove gitea
-fi
+#fi
 
 %files
+%attr(644, root, root) %{_sysconfdir}/nginx/conf.d/git.netoik.io.conf
+
 %dir %attr(755, root, root) %{_sysconfdir}/gitea
-%attr(600, root, root) %{_sysconfdir}/gitea/app.ini
+%attr(640, root, -) %{_sysconfdir}/gitea/app.ini
 
 %attr(644, root, root) %{_unitdir}/gitea.service
 %attr(644, root, root) %{_unitdir}/actrunner@.service
@@ -79,5 +82,3 @@ fi
 
 %changelog
 %autochangelog
-
-