From 1a2203ba3c756a4d5b0c574a999e09dd1026ad75 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 18 Feb 2025 13:13:08 -0500 Subject: [PATCH] ilot/codeberg-pages-server: upgrade to 6.2.1 --- ilot/codeberg-pages-server/APKBUILD | 14 +++++--- .../codeberg-pages-server.openrc | 33 ++++++++----------- ilot/codeberg-pages-server/downgrade-go.patch | 12 +++++++ 3 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 ilot/codeberg-pages-server/downgrade-go.patch diff --git a/ilot/codeberg-pages-server/APKBUILD b/ilot/codeberg-pages-server/APKBUILD index 75ecfbb..964852f 100644 --- a/ilot/codeberg-pages-server/APKBUILD +++ b/ilot/codeberg-pages-server/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Antoine Martin (ayakael) # Maintainer: Antoine Martin (ayakael) pkgname=codeberg-pages-server -pkgver=6.2 +pkgver=6.2.1 pkgrel=0 pkgdesc="The Codeberg Pages Server – with custom domain support, per-repo pages using the pages branch, caching and more." url="https://codeberg.org/Codeberg/pages-server" @@ -14,6 +14,7 @@ options="!check" source=" $pkgname-$pkgver.tar.gz::https://codeberg.org/Codeberg/pages-server/archive/v$pkgver.tar.gz codeberg-pages-server.openrc + downgrade-go.patch " builddir="$srcdir/"pages-server subpackages="$pkgname-openrc" @@ -30,13 +31,18 @@ build() { package() { msg "Packaging $pkgname" - install -Dm755 "$builddir"/build/codeberg-pages-server "$pkgdir"/usr/bin/codeberg-pages-server + install -Dm755 "$builddir"/build/codeberg-pages-server \ + "$pkgdir"/usr/bin/codeberg-pages-server install -Dm755 "$srcdir"/$pkgname.openrc \ "$pkgdir"/etc/init.d/$pkgname + + install -Dm600 "$builddir"/example_config.toml \ + "$pkgdir"/etc/codeberg-pages-server/pages.conf } sha512sums=" -d48e10262e94eb2e36696646e3431da066d2f820e037ab713f4446dd72c2e3895c9bf153fcbf702e05b21ec5750aa15ed9b71e2fb383f9357aeeef61073a721a codeberg-pages-server-6.2.tar.gz -4defb4fe3a4230f4aa517fbecd5e5b8bcef2a64e1b40615660ae9eec33597310a09df5e126f4d39ce7764bd1716c0a7040637699135c103cbc1879593c6c06f1 codeberg-pages-server.openrc +87992a244a580ef109fa891fd4e4ab5bf8320076f396c63e23b83e2c49e3c34fed2d6562283fc57dd89ebc13596dd7b8cbdfa7202eee43cbbd86b6a7f3b52c26 codeberg-pages-server-6.2.1.tar.gz +4808057de5d539fd9ad3db67b650d45ed60c53e07eff840115af09729ac198791b465b61da547eac1dffd0633e5855c348aa7663d6f6cb5984f7fc999be08589 codeberg-pages-server.openrc +1f02e3e9a6f0aab9b516fa7ffaaeb92da3ab839fbcf07f672398063d784c8c0ca373edc0f9a26132d40a60345c4894a5f757c13bf7500f5753f5ffcdf10c52db downgrade-go.patch " diff --git a/ilot/codeberg-pages-server/codeberg-pages-server.openrc b/ilot/codeberg-pages-server/codeberg-pages-server.openrc index a036393..fe2ce85 100644 --- a/ilot/codeberg-pages-server/codeberg-pages-server.openrc +++ b/ilot/codeberg-pages-server/codeberg-pages-server.openrc @@ -1,30 +1,23 @@ #!/sbin/openrc-run - + +: ${config:=/etc/codeberg-pages-server/pages.conf} + name="$RC_SVCNAME" cfgfile="/etc/conf.d/$RC_SVCNAME.conf" pidfile="/run/$RC_SVCNAME.pid" -working_directory="/usr/share/webapps/authentik" -command="/usr/share/webapps/authentik/server" -command_user="authentik" -command_group="authentik" +working_directory="/var/lib/codeberg-pages-server" +command="/usr/bin/codeberg-pages-server" +command_args="--config-file $config" +command_user="nginx" +command_group="nginx" start_stop_daemon_args="" command_background="yes" -output_log="/var/log/authentik/$RC_SVCNAME.log" -error_log="/var/log/authentik/$RC_SVCNAME.err" - -depend() { - need redis - need postgresql -} +output_log="/var/log/codeberg-pages-server/$RC_SVCNAME.log" +error_log="/var/log/codeberg-pages-server/$RC_SVCNAME.err" start_pre() { - cd "$working_directory" checkpath --directory --owner $command_user:$command_group --mode 0775 \ - /var/log/authentik \ - /var/lib/authentik/certs -} - -stop_pre() { - ebegin "Killing child processes" - kill $(ps -o pid= --ppid $(cat $pidfile)) || true + /var/log/codeberg-pages-server \ + /var/lib/codeberg-pages-server + cd "$working_directory" } diff --git a/ilot/codeberg-pages-server/downgrade-go.patch b/ilot/codeberg-pages-server/downgrade-go.patch new file mode 100644 index 0000000..80988d5 --- /dev/null +++ b/ilot/codeberg-pages-server/downgrade-go.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod.orig b/go.mod +index bff6b77..2b9f2e4 100644 +--- a/go.mod.orig ++++ b/go.mod +@@ -1,6 +1,6 @@ + module codeberg.org/codeberg/pages + +-go 1.24.0 ++go 1.23.6 + + require ( + code.gitea.io/sdk/gitea v0.20.0