From 9b9d8f4b7f1e02e7c9e248e68af1614b1a4ddf25 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Tue, 29 Dec 2020 18:30:07 +0000 Subject: [PATCH] Follow FHS for gitea --- configs/gitea/APKBUILD | 8 ++++---- configs/unbound/APKBUILD | 6 +++--- configs/unbound/zones/redxen.eu | 2 -- cron/gitea/APKBUILD | 2 +- cron/gitea/cron-daily | 4 ++-- data/gitea-theme/APKBUILD | 6 +++--- openrc/gitea/APKBUILD | 6 +++--- openrc/gitea/conffile | 4 ++-- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/configs/gitea/APKBUILD b/configs/gitea/APKBUILD index fa679b7..ee006f2 100644 --- a/configs/gitea/APKBUILD +++ b/configs/gitea/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-gitea -pkgver=2020.12.24 -pkgrel=0 +pkgver=2020.12.29 +pkgrel=4 pkgdesc="Gitea configuration" url="https://git.redxen.eu/RedXen" arch="noarch" @@ -14,8 +14,8 @@ source=" options="!check" package() { - install -dm755 "$pkgdir"/gitea + install -dm755 "$pkgdir"/var/lib/gitea install -Dm644 gitea.ini "$pkgdir"/etc/gitea/redxen.ini } -sha512sums="7a8e460bd3e30318b5e526808485782b5c105765e2b24783168c388d8c8ee5dd1f633b5f448d5bf36306fd4c630c29be247a78ae0570c3d18599d9653c927c23 gitea.ini" +sha512sums="b38cfd3921f150572a41ad6806b68b6f9f9ae4c2ce0b80961fa7958eabcb0205f9cee348363e819574a488de7db6eaa9f7a6ab8a82744fd76adbd1e19635ed53 gitea.ini" diff --git a/configs/unbound/APKBUILD b/configs/unbound/APKBUILD index 67267f6..21a6add 100644 --- a/configs/unbound/APKBUILD +++ b/configs/unbound/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-unbound -pkgver=2020.12.27 -pkgrel=5 +pkgver=2020.12.28 +pkgrel=0 pkgdesc="Unbound configurations and some other stuff." url="https://git.redxen.eu/RedXen" arch="noarch" @@ -63,4 +63,4 @@ d3754ced9d8055ff7f1d364a93c403bba3f220a60ea519bceee5e9c43112d6a00d20d15cf659fdd6 d94ad338e2ea43c3ecdc62c861eddc0bb706807b738dd985309bcdf0b5fb435d7260bf272e2bbe40a774ec5b8fa49cbf23624c2c5213eea94f4f14aa3720abfa rctrl.conf 2183abc076166cd2026ccbf8d65e51870ca26a6fe11fbe48f2dbf9e8b8801b8b7c91c3607b2a48a254aeb8e364564fea361a2e3eccf13e0477542f7f3919bb5c internal.conf 28c917fe7f69643887097553312c4f1ffc747dffdbf150430e6c4b2e5833567922810716cb59a27887915664777ac3263be3c826956f504499f0ebdcc0b3aac5 auth-zones.conf -329f1f86af630b53253f05847e6f74009ead6fa9fb349a92966434a4d40937ec83c38553bb5b2dcac0cc3993a9dd5b7a498b03ea5f19773b00c48627b71c15b0 redxen.eu" +ad9f82713cbc0145ae24f2b230c9577a46a9c2a7166bc167792b5a2ad68cff30adb0e67762eac3e188f2b9bd749171b4bb88b248582aa3823b15aa57d368e861 redxen.eu" diff --git a/configs/unbound/zones/redxen.eu b/configs/unbound/zones/redxen.eu index 2a590b8..c497cd4 100644 --- a/configs/unbound/zones/redxen.eu +++ b/configs/unbound/zones/redxen.eu @@ -115,7 +115,5 @@ n0.redxen.eu. 86400 IN A 78.46.197.89 n0.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:6ed1::1 n1.redxen.eu. 86400 IN A 94.130.108.207 n1.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8d8d::1 -n2.redxen.eu. 86400 IN A 116.203.235.73 -n2.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:e8b9::1 n4.redxen.eu. 86400 IN A 94.130.107.187 n4.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8990::1 diff --git a/cron/gitea/APKBUILD b/cron/gitea/APKBUILD index 9b07ec3..db2f4b0 100644 --- a/cron/gitea/APKBUILD +++ b/cron/gitea/APKBUILD @@ -19,4 +19,4 @@ package() { install -Dm544 cron-daily "$pkgdir"/etc/periodic/daily/snapshot-gitea } -sha512sums="6293e66a7a24519958116a71adb0e05d25419302816118c58fac2673e3457f1955a2667effa097c588afd7e0e3b4deac95f04f646595e1a64b71bf4bddc0a5cc cron-daily" +sha512sums="1628ddf15426b3f6aeb03d81e2f12d701925f943ddf77da2b9af0b44c10baaf5be6f1f8a9a2bff17d09242127dde54d9fdf06bdc3826fb8ff4e35ec28f3da644 cron-daily" diff --git a/cron/gitea/cron-daily b/cron/gitea/cron-daily index 40624d2..ebfcccd 100644 --- a/cron/gitea/cron-daily +++ b/cron/gitea/cron-daily @@ -1,3 +1,3 @@ #!/bin/sh -/sbin/btrfs subvolume delete /gitea/snapshots/`date +"%u"` -/sbin/btrfs subvolume snapshot -r /gitea /gitea/snapshots/`date +"%u"` +/sbin/btrfs subvolume delete /var/lib/gitea/snapshots/`date +"%u"` +/sbin/btrfs subvolume snapshot -r /var/lib/gitea /var/lib/gitea/snapshots/`date +"%u"` diff --git a/data/gitea-theme/APKBUILD b/data/gitea-theme/APKBUILD index e740a25..485d29d 100644 --- a/data/gitea-theme/APKBUILD +++ b/data/gitea-theme/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-data-gitea-theme -pkgver=2020.12.27 -pkgrel=1 +pkgver=2020.12.29 +pkgrel=0 pkgdesc="Gitea customization files" url="https://git.redxen.eu/RedXen" arch="noarch" @@ -15,7 +15,7 @@ source=" redxen.css " builddir="$srcdir" -_customroot="var/lib/gitea/custom" +_customroot="usr/share/gitea/custom" build() { sizes="120 180 192 512 880" diff --git a/openrc/gitea/APKBUILD b/openrc/gitea/APKBUILD index 2b09dca..c423410 100644 --- a/openrc/gitea/APKBUILD +++ b/openrc/gitea/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-openrc-gitea -pkgver=2020.12.27 -pkgrel=0 +pkgver=2020.12.29 +pkgrel=1 pkgdesc="Gitea OpenRC service files" url="https://git.redxen.eu/RedXen" arch="noarch" @@ -20,4 +20,4 @@ package() { install -Dm644 conffile "$pkgdir"/etc/conf.d/gitea.redxen } sha512sums="bc341c2ebaa77ed1a2ce8c75f42fa163071ff7d8af49c7263dac278fef333e974aa62b25443002a95daa105543d0e92921a8056fe97e4f1fce8a3ac97270006c runfile -65016c3f31cf55b2a1a054004bc0c9965a8278de5bdf00c720a9dc2023265a487ee5fd64058e477e990ed80f1468e5dc86e4a67b3d1e8073072db3abf0c6f247 conffile" +958773d7921fb92d30c9f30894d78b08785afcd64318f8d49654b27483ed653fe32a9ac482a19202b1f3bebebadaf4f87392dab068faac81b77fe4f5f5d60906 conffile" diff --git a/openrc/gitea/conffile b/openrc/gitea/conffile index bb76876..231564c 100644 --- a/openrc/gitea/conffile +++ b/openrc/gitea/conffile @@ -1,3 +1,3 @@ GITEA_CONF=/etc/gitea/redxen.ini -GITEA_WORK_DIR=/gitea -GITEA_CUSTOM=/var/lib/gitea/custom +GITEA_WORK_DIR=/var/lib/gitea +GITEA_CUSTOM=/usr/share/gitea/custom