diff --git a/configs/gitea/APKBUILD b/configs/gitea/APKBUILD index 755e76c..e0709b4 100644 --- a/configs/gitea/APKBUILD +++ b/configs/gitea/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-gitea -pkgver=2020.12.7 +pkgver=2020.12.22 pkgrel=0 pkgdesc="Gitea configuration" url="https://git.redxen.eu/RedXen" @@ -14,6 +14,8 @@ source=" options="!check" package() { + install -dm755 "$pkgdir"/gitea install -Dm644 gitea.ini "$pkgdir"/etc/gitea/redxen.ini } +sha512sums="7648a68287dc514819a2365210fc91f94b94e57bebf00a51faf8b97d98d9f99a3316083a56dfa6299cf5c0457a3c692d7829977ba32616110f74f664f8585f54 gitea.ini" diff --git a/configs/haproxy/APKBUILD b/configs/haproxy/APKBUILD index d39d360..a258623 100644 --- a/configs/haproxy/APKBUILD +++ b/configs/haproxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-haproxy -pkgver=2020.12.18 +pkgver=2020.12.22 pkgrel=0 pkgdesc="HAProxy frontend configuration" url="https://git.redxen.eu/RedXen" @@ -21,4 +21,4 @@ check() { haproxy -c -f main.cfg } -sha512sums="23c4ed7cd0b305bffd59774856adab6f996ebdb108ca588fb40206be115c671d6e32fc2ff3837b6946528593f313109cc74c5b191c0c1815385b2b7d2de2b670 main.cfg" +sha512sums="567d0e7bc1479024102d4ad3a9075ff75d137ae42889e032b0e6b463baae20b458cc42406b3cd1389286a9ff5653c58f661f9934b25bd05791d33e7ca132dab9 main.cfg" diff --git a/configs/haproxy/main.cfg b/configs/haproxy/main.cfg index a93c4c8..78fad49 100644 --- a/configs/haproxy/main.cfg +++ b/configs/haproxy/main.cfg @@ -44,6 +44,12 @@ listen murmur option tcp-check server-template murmur 1 _murmur._tcp.routinginfo.redxen.localhost +listen git-gitea + mode tcp + bind ipv4@*:2442,ipv6@*:2442 + option tcp-check + server-template gitssh 1 _gitssh._tcp.routinginfo.redxen.localhost + frontend http mode http bind ipv4@:443,ipv6@:443 ssl crt /etc/ssl/redxen/letsencrypt/fullchain.crt alpn h2,http/1.1 @@ -92,3 +98,4 @@ frontend http backend backend-gitea server-template gitea 1 _gitea._tcp.routinginfo.redxen.localhost option httpchk HEAD / HTTP/1.1 + http-check send hdr Host gitea.redxen.eu diff --git a/configs/postgresql/APKBUILD b/configs/postgresql/APKBUILD index 09c42ad..bf8f2fe 100644 --- a/configs/postgresql/APKBUILD +++ b/configs/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-postgresql -pkgver=2020.12.13 +pkgver=2020.12.22 pkgrel=0 pkgdesc="PostgreSQL configuration files" url="https://git.redxen.eu/RedXen" @@ -23,5 +23,5 @@ package() { } sha512sums="488704a30e019d498f1cc27d1d3ae30c2e62be01549f593e72a4e42f476b46efdce5e97ffc9aa7f33d67c5d7752e5cc6f146f5377c459719bb2bcb07a404951c postgresql.conf -2af9c5acacaa2f82e15931d676bac4b89ade6ff91503e09583a35da36d69d0370a314db1de78665ba5cdb8f98cc7f09684efe9c97caa9385541159d170254cd6 pg_hba.conf +dfda1183c006f361874f8ab0f6b4e9b3f3e32dcd24b6089f3390c441e5c17b1ee823c68f4d932e3560ea5bb5fc95276bc7cafe6c00d7417ea164cf81193cc92a pg_hba.conf cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e pg_ident.conf" diff --git a/configs/postgresql/pg_hba.conf b/configs/postgresql/pg_hba.conf index d38b051..b85f48c 100644 --- a/configs/postgresql/pg_hba.conf +++ b/configs/postgresql/pg_hba.conf @@ -1,5 +1,6 @@ local all postgres trust host murmur murmur 0200::/7 md5 host grafana grafana 0200::/7 md5 +host gitea gitea 0200::/7 md5 host all telegraf 127.0.0.1/32 md5 host all telegraf ::1/128 md5 diff --git a/configs/unbound/APKBUILD b/configs/unbound/APKBUILD index bdf0457..a456a56 100644 --- a/configs/unbound/APKBUILD +++ b/configs/unbound/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alex Denes pkgname=redxen-config-unbound pkgver=2020.12.22 -pkgrel=0 +pkgrel=4 pkgdesc="Unbound configurations and some other stuff." url="https://git.redxen.eu/RedXen" arch="noarch" @@ -38,5 +38,5 @@ internal() { sha512sums="1f767995d4208f94e38f98c20538d7255c70e14cf11bed2ee13837ee765b5b098e6890dacf48334a59f1fbc40ed3f5e78dacba87f9674d9e6db3c701abc862d9 main.conf 54a3f178a2d922822f7ed77a9c6f701f58bbb6b35fba4e4016ef00c6bb3a03c478d7720cffad45bbfb5b54c906c4faaa6d4da629a097238e303b7d13c7a3c2c2 base.conf -6f8fa08194a35a455808c70eb64284545ed4d25f18946474bff081cfb25d2d8bfcfafaf6064ebb43c045de0d0d9b21367c11028436a304f8979dcf99bc2772c9 internal.conf -5d3dde837cf8673c438b0700731652f373536db5aba655f0e22208910d2ee73819246371bb785aec34c095145353a80fea48acd4a91ab46c5763d2e618227e89 redxen-dns.conf" +3f80b1a4e4e02b985133eaa2602939940a706e1629944287b67e08ed1a3b54c07f44f6e923cabd05955d643988809a2ce0a6096473de4c4dcbc476fb8e0bca7a internal.conf +646df79952adc259fcab0ea3d5c84bbbfc2bda4feaa43dbddb2ac95bf5774e16590dbd290cdaf1165cf3ca5a8e511eca3b4db97acbe6d88fdf65d7a336f2d5e6 redxen-dns.conf" diff --git a/configs/unbound/internal.conf b/configs/unbound/internal.conf index 157f3e8..69a61df 100644 --- a/configs/unbound/internal.conf +++ b/configs/unbound/internal.conf @@ -5,7 +5,7 @@ server: local-data: "8101153.nbg1-dc3.hetzner.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805" local-data: "8201371.fsn1-dc14.hetzner.redxen.localhost. 86400 IN AAAA 200:8656:aa4:dc68:888:d92c:914b:866b" local-data: "9013723.fsn1-dc14.hetzner.redxen.localhost. 86400 IN AAAA 200:2749:8af:bdf9:f011:997e:7bbb:35f3" - local-data: "9227948.nbg1-dc3.hetzner.redxen.localhost. 86400 IN AAAA 200:17cb:399a:e52a:a7d8:74f3:873f:5c5a" + local-data: "9227948.nbg1-dc3.hetzner.redxen.localhost. 86400 IN AAAA 201:3b84:3e03:9e0f:4885:fb55:45f6:ebbd" # Familiar names local-data: "lain.nurnberg.hetzner.redxen.localhost. 86400 IN CNAME 8101153.nbg1-dc3.hetzner.redxen.localhost." @@ -19,6 +19,8 @@ server: local-data: "_transmission._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7572 9013723.fsn1-dc14.hetzner.redxen.localhost." local-data: "_root._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7574 8201371.fsn1-dc14.hetzner.redxen.localhost." local-data: "_seedown._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7574 9013723.fsn1-dc14.hetzner.redxen.localhost." + local-data: "_gitea._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7570 9227948.nbg1-dc3.hetzner.redxen.localhost." + local-data: "_gitssh._tcp.routinginfo.redxen.localhost. 60 IN SRV 0 5 7572 9227948.nbg1-dc3.hetzner.redxen.localhost." # Services (no CNAME/SRV support) local-data: "postgresql.routinginfo.redxen.localhost. 86400 IN AAAA 201:5d63:154:f0c6:9789:1899:6acb:1805" diff --git a/configs/unbound/redxen-dns.conf b/configs/unbound/redxen-dns.conf index 8d421ac..eb18b71 100644 --- a/configs/unbound/redxen-dns.conf +++ b/configs/unbound/redxen-dns.conf @@ -36,6 +36,13 @@ server: local-data: "redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:9a10::1" local-data: "redxen.eu. 86400 IN AAAA 2a01:4f8:c17:436e::1" + # Gitea + local-data: "git.redxen.eu. 86400 IN A 94.130.110.3" + local-data: "git.redxen.eu. 86400 IN A 78.46.207.237" + + local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:9a10::1" + local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c17:436e::1" + # Mumble local-data: "mumble.redxen.eu. 86400 IN A 94.130.110.3" local-data: "mumble.redxen.eu. 86400 IN A 78.46.207.237" @@ -94,29 +101,14 @@ server: local-data: "n1.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8d8d::1" local-data: "n2.redxen.eu. 86400 IN A 116.203.235.73" local-data: "n2.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:e8b9::1" - local-data: "n3.redxen.eu. 86400 IN A 94.130.108.81" - local-data: "n3.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8b23::1" local-data: "n4.redxen.eu. 86400 IN A 94.130.107.187" local-data: "n4.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8990::1" - local-data: "git.redxen.eu. 86400 IN A 78.46.197.89" - local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:6ed1::1" - local-data: "git.redxen.eu. 86400 IN A 94.130.108.207" - local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8d8d::1" - local-data: "git.redxen.eu. 86400 IN A 116.203.235.73" - local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:e8b9::1" - local-data: "git.redxen.eu. 86400 IN A 94.130.108.81" - local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8b23::1" - local-data: "git.redxen.eu. 86400 IN A 94.130.107.187" - local-data: "git.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8990::1" - local-data: "social.redxen.eu. 86400 IN A 78.46.197.89" local-data: "social.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:6ed1::1" local-data: "social.redxen.eu. 86400 IN A 94.130.108.207" local-data: "social.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8d8d::1" local-data: "social.redxen.eu. 86400 IN A 116.203.235.73" local-data: "social.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:e8b9::1" - local-data: "social.redxen.eu. 86400 IN A 94.130.108.81" - local-data: "social.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8b23::1" local-data: "social.redxen.eu. 86400 IN A 94.130.107.187" local-data: "social.redxen.eu. 86400 IN AAAA 2a01:4f8:c0c:8990::1" diff --git a/openrc/gitea/APKBUILD b/openrc/gitea/APKBUILD new file mode 100644 index 0000000..68cbcf4 --- /dev/null +++ b/openrc/gitea/APKBUILD @@ -0,0 +1,23 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +pkgname=redxen-openrc-gitea +pkgver=2020.12.22 +pkgrel=1 +pkgdesc="Gitea OpenRC service files" +url="https://git.redxen.eu/RedXen" +arch="noarch" +license="none" +depends="openrc redxen-config-gitea" +options="!check" +source=" + runfile + conffile +" +builddir="$srcdir" + +package() { + install -Dm755 runfile "$pkgdir"/etc/init.d/gitea.redxen + install -Dm644 conffile "$pkgdir"/etc/conf.d/gitea.redxen +} +sha512sums="36549d4308a540d14e3ed4037a44ea6fcf1a0e7decc8553a45fcf2f28c22fc9d92653ac59082c21ee03b90b8860b8de0b951d3135724d6be1b65a889382235fb runfile +2adbbbb1b0e6c70780132e2df64f39bfc3a14f0a66e703fe6310cd2c1d5eb0a3cd53ecb415c6ce76ef584016aaa0514582e8e38327576e952d1b93f9de4284da conffile" diff --git a/openrc/gitea/conffile b/openrc/gitea/conffile new file mode 100644 index 0000000..bc25fbe --- /dev/null +++ b/openrc/gitea/conffile @@ -0,0 +1,2 @@ +GITEA_CONF=/etc/gitea/redxen.ini +GITEA_WORK_DIR=/gitea diff --git a/openrc/gitea/runfile b/openrc/gitea/runfile new file mode 100644 index 0000000..dfe7326 --- /dev/null +++ b/openrc/gitea/runfile @@ -0,0 +1,20 @@ +#!/sbin/openrc-run + +supervisor=supervise-daemon +name=gitea +command="/usr/bin/gitea" +command_user="${GITEA_USER:-gitea}" +command_args="web --config '${GITEA_CONF:-/etc/gitea/app.ini}'" +supervise_daemon_args="--env GITEA_WORK_DIR='${GITEA_WORK_DIR:-/var/lib/gitea}' --chdir '${GITEA_WORK_DIR:-/var/lib/gitea}' --stdout '${GITEA_LOG_FILE:-/var/log/gitea/http.log}' --stderr '${GITEA_LOG_FILE:-/var/log/gitea/http.log}'" +pidfile="/run/gitea.pid" + +depend() { + use logger dns + need net + after firewall mysql postgresql +} + +start_pre() { + checkpath -d -o "$command_user" -m755 "${GITEA_WORK_DIR:-/var/lib/gitea}" +} +