Use common format for configs

.gitignore

@@ -1,15 +1,15 @@
 src/
 pkg/
 .rootbld-repositories
-secrets/nginx-httpauth
-secrets/letsencrypt/private.key
-secrets/letsencrypt/public.pem
-configs/murmur/murmur.ini
-configs/transmission-daemon/main.json
-configs/wireguard/main.conf
-configs/grafana/grafana.ini
-configs/gitea/gitea.ini
-configs/dovecot/pgsql.conf
-configs/postfix/pgsql-aliases.cf
-configs/postfix/pgsql-users.cf
-configs/opendkim/mail.key
+secret/nginx-httpauth
+secret/letsencrypt/private.key
+secret/letsencrypt/public.pem
+config/murmur/murmur.ini
+config/transmission-daemon/settings.json
+config/wireguard/main.conf
+config/grafana/main.ini
+config/gitea/redxen.ini
+config/dovecot/pgsql.conf
+config/postfix/pgsql-aliases.cf
+config/postfix/pgsql-users.cf
+config/fastd/crxn-router.conf

PORT-ALLOCATION

@@ -38,6 +38,9 @@ Public ports:
 	Dovecot:
 	    IMAP:       143
 	    +TLS:       993
+	CRXN:
+	    FastD:      2190
+	    BabelD:     6696
 	Xonotic:        26000
 	Transmission:   51413
 	Wireguard:      51820

config/APKBUILD-config.common

@@ -0,0 +1,20 @@
+pkgname=redxen-config-$_svcname
+pkgver="$(date +'%Y.%m.%d')"
+url="https://git.redxen.eu/RedXen/aports"
+arch="noarch"
+license="none"
+pkgdesc="RedXen service config for $_svcname"
+options="!check"
+depends="$_svcname"
+builddir="$srcdir"
+
+package_copy_configs() {
+	for i in ${1:-$source}; do
+		install -Dm"${_cfgumask:-644}" "$i" "$pkgdir"/"${_configpath:-/etc/${_svcname}}"/"$i"
+	done
+}
+
+package() {
+	package_copy_configs
+}
+

config/dovecot/APKBUILD

@@ -1,24 +1,21 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-dovecot
+_svcname=dovecot
+_configpath="/etc/dovecot/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.17
-pkgrel=0
-pkgdesc="Dovecot configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="dovecot dovecot-lmtpd dovecot-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
 install="$pkgname.pre-install"
 source="
 	dovecot.conf
 	pgsql.conf
 "
-options="!check"
-builddir="$srcdir"
 
 package() {
-	install -Dm644 dovecot.conf "$pkgdir"/etc/dovecot/redxen/dovecot.conf
-	install -Dm644 pgsql.conf "$pkgdir"/etc/dovecot/redxen/pgsql.conf
+	package_copy_configs
 	mkdir -p "$pkgdir"/var/mail
 }
 

config/gitea/APKBUILD

@@ -0,0 +1,17 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=gitea
+
+. ../APKBUILD-config.common
+
+pkgver=2021.01.27
+pkgrel=1
+depends="gitea redxen-data-gitea-theme"
+source="redxen.ini"
+
+package() {
+	package_copy_configs
+	mkdir -p "$pkgdir"/var/lib/gitea
+}
+
+sha512sums="41d387f28981777fa52581fe00549d15677bbafa232f82b504ed342ce188cdddabffbd9bb900ad7d0f5b73d7c4f78599715541f46b93b42b22f2f5077455c1eb  redxen.ini"

config/grafana/APKBUILD

@@ -0,0 +1,12 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=grafana
+_cfgumask=400
+
+. ../APKBUILD-config.common
+
+pkgver=2021.01.13
+pkgrel=3
+source="main.ini"
+
+sha512sums="90d7ac741be339613b325886ef485091c3f2662fc32e98a723935ef27838547ceea89ae4800d780b51411334264d5678c3431c3e4b3c34cfedd5373cba72ab62  main.ini"

config/haproxy/APKBUILD

@@ -1,24 +1,16 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-haproxy
+_svcname=haproxy
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.30
-pkgrel=0
-pkgdesc="HAProxy frontend configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="haproxy redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
-source="
-	main.cfg
-"
-options="!check" # Certificate is not readable by building user
+source="main.cfg"
 
-package() {
-	install -Dm644 main.cfg "$pkgdir"/etc/haproxy/main.cfg
-}
-
-check() {
-	haproxy -c -f main.cfg
-}
+#check() {
+#	haproxy -c -f main.cfg # Certificates aren't readable by the building user
+#}
 
 sha512sums="4dde4c5a43c83668a812225907e3e588fe9e9d3ee93be0b119641d754b6c7c9cba37c4e045a1d42304106e7c43bf0ccc9fd21bdfb9377579f9f8466e38819731  main.cfg"

config/hitch/APKBUILD

@@ -0,0 +1,15 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=hitch
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.7
+pkgrel=1
+source="main.conf"
+
+#check() {
+#	hitch -t --config main.conf # Certificate not readable by the building user
+#}
+
+sha512sums="b830c09953bd4908fd9d69c5e386b0f314b87d44bf2c19dcfa2bb5f790a842d617888e4c47802eaab8bea676bd1d060bae47965ac0946bbb9b5dc95ca990d01d  main.conf"

config/influxdb/APKBUILD

@@ -0,0 +1,16 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=influxdb
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.29
+pkgrel=1
+source="redxen.conf"
+
+package() {
+	package_copy_configs
+	install -dm700 "$pkgdir"/var/lib/influxdb
+}
+
+sha512sums="e251c8e25fb0d4a258f17425d277553d65a0b4b078c60ceec973bb421fdda42130d0e9cb38a70a85f5258407b02219ce9f79e551908a9f8e593a00852f5f81b4  redxen.conf"

config/ipset/APKBUILD

@@ -1,24 +1,16 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-ipset
+_svcname=ipset
+_configpath="/etc/ipset.d/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.28
-pkgrel=1
-pkgdesc="IPSec firewall configs"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="ipset"
+pkgrel=2
 source="
 	netwide4
 	netwide6
 "
-options="!check"
-builddir="$srcdir"
-
-package() {
-	install -Dm644 netwide4 "$pkgdir"/etc/ipset.d/redxen/netwide4
-	install -Dm644 netwide6 "$pkgdir"/etc/ipset.d/redxen/netwide6
-}
 
 sha512sums="0c70b7b82c481ebcd755d4cf9a3c8d3490d1ea022158e32d1a4cf26152e9482858aeb09d7b68600e3d60312eba6d938a82bfa8012f2a19216dec69f05db4a250  netwide4
 dccd10b2fe5960bcf6466b27fabfbc5c80df40d33e744e84bd013c4b12e2fbb9fe4555568debb3cbbe851ff88f7b733ff19706073f2f29295d336a36efca4d07  netwide6"

config/iptables/APKBUILD

@@ -1,24 +1,16 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-iptables
+_svcname=iptables
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.28
-pkgrel=2
-pkgdesc="IPTables firewall configs"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=3
 depends="iptables ip6tables redxen-config-ipset"
 source="
-	rules-v4
-	rules-v6
+	rx-rules4
+	rx-rules6
 "
-options="!check"
-builddir="$srcdir"
 
-package() {
-	install -Dm644 rules-v4 "$pkgdir"/etc/iptables/rx-rules4
-	install -Dm644 rules-v6 "$pkgdir"/etc/iptables/rx-rules6
-}
-
-sha512sums="c29f7f22fcabdd90fb3cd63f1e67ce340145be9a832c0ce23fadfd2a83e477c90373c052c6d750d3136dfeb951098c2bc7d05e1bfd6b7cb8f886a2e632587094  rules-v4
-92b3c7dad3bcf9583ae9af4ba111b35ac5d0eae3ca50969be2941efc72270dd423689cceb93d55fe0286949a7b4a124a0e59bb170a99776bf99c835884da060c  rules-v6"
+sha512sums="c29f7f22fcabdd90fb3cd63f1e67ce340145be9a832c0ce23fadfd2a83e477c90373c052c6d750d3136dfeb951098c2bc7d05e1bfd6b7cb8f886a2e632587094  rx-rules4
+92b3c7dad3bcf9583ae9af4ba111b35ac5d0eae3ca50969be2941efc72270dd423689cceb93d55fe0286949a7b4a124a0e59bb170a99776bf99c835884da060c  rx-rules6"

config/lighttpd/APKBUILD

@@ -1,20 +1,18 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-lighttpd
+_svcname=lighttpd
+_configpath="/etc/lighttpd/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2020.12.11
-pkgrel=0
-pkgdesc="LigHTTPd configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="lighttpd"
-source="
-	main.conf
-"
+pkgrel=1
+source="main.conf"
+options="" # Default options
 
 package() {
-	install -dm755 "$pkgdir"/http
-	install -Dm440 main.conf "$pkgdir"/etc/lighttpd/redxen/main.conf
+	package_copy_configs
+	mkdir -p "$pkgdir"/http
 }
 
 check() {

config/murmur/APKBUILD

@@ -1,21 +1,14 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-murmur
+_svcname=murmur
+_cfgumask=400
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.30
-pkgrel=0
-pkgdesc="Murmur configuration files"
-url="https://git.redxen.eu/RedXen/aports"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="murmur qt5-qtbase-postgresql redxen-secret-selfsigned-public redxen-secret-selfsigned-private"
-options="!check" # Murmur doesn't offer a way to check configs
-source="
-	murmur.ini
-"
+source="murmur.ini"
 install="$pkgname.pre-install"
 
-package() {
-	install -Dm600 murmur.ini "$pkgdir"/etc/murmur/murmur.ini
-}
-
 sha512sums="9cbed968233867662e46ca116dcc7a271496a869b88f7826fbf16b2f9034344495f0f7326f2c852cdc743496b9d93148d66379d952b6bd119147e371db1c4426  murmur.ini"

config/nginx/APKBUILD

@@ -1,12 +1,11 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-nginx
+_svcname=nginx
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.26
-pkgrel=0
-pkgdesc="NGINX configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="nginx nginx-mod-http-zip"
 subpackages="$pkgname-seedbox $pkgname-alpine $pkgname-homepage"
 source="
@@ -15,8 +14,6 @@ source="
 	modules/alpine.conf
 	modules/homepage.conf
 "
-options="!check"
-builddir="$srcdir"
 
 package() {
 	install -Dm400 main.conf "$pkgdir"/etc/nginx/redxen.conf

config/opendkim/APKBUILD

@@ -1,13 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
 pkgname=redxen-config-opendkim
-pkgver="$(date +'%Y.%m.%d')"
+
+. ../APKBUILD-config.common
+
+# Date is always changing due to constant key generation
+# TODO: Split this into DNS subpackage and key subpackage
 pkgrel=0
 pkgdesc="OpenDKIM configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="opendkim"
 makedepends="opendkim-utils"
 source="
 	trusted_hosts
@@ -15,8 +15,6 @@ source="
 	key_table
 	opendkim.conf
 "
-builddir="$srcdir"
-options="!check"
 
 build() {
 	opendkim-genkey -b 2048 -s mail -d redxen.eu

config/openssh-sftp-seedbox/APKBUILD

@@ -1,18 +1,16 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-openssh-sftp-seedbox
-pkgver=2020.12.7
+_svcname=openssh-sftp-seedbox
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.07
 pkgrel=0
-pkgdesc="OpenSSH seedbox sftp access and user"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
 depends="openssh"
 source="
 	seedbox-conf
 	allowed_keys
 "
-options="!check"
 
 package() {
 	install -dm755 -o root -g root "$pkgdir"/sftp-chroot

config/postfix/APKBUILD

@@ -1,14 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-postfix
+_svcname=postfix
+_configpath="/etc/postfix/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.27
-pkgrel=0
-pkgdesc="Postfix configuration files"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="postfix postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
-options="!check"
 install="$pkgname.pre-install"
 source="
 	master.cf
@@ -17,13 +16,6 @@ source="
 	pgsql-users.cf
 "
 
-package() {
-	install -Dm644 master.cf "$pkgdir"/etc/postfix/redxen/master.cf
-	install -Dm644 main.cf "$pkgdir"/etc/postfix/redxen/main.cf
-	install -Dm644 pgsql-aliases.cf "$pkgdir"/etc/postfix/redxen/pgsql-aliases.cf
-	install -Dm644 pgsql-users.cf "$pkgdir"/etc/postfix/redxen/pgsql-users.cf
-}
-
 sha512sums="0c7bcc9e63762b12937938e31b25ed6a84508061fef2913625d7c89b1d6e4f27dfbe2065aca2f75e7c3a62d38cd613afc70af40526d7fd11c942bc4ba8b59515  master.cf
 643f3f010b8b775082cd34d4853e8dd02a9101ed581103e2d10f9e973237ea2de7a45d2d1b1afb50cae52f594f0b9c051ddcd92e8cf7f77acfdc06bdcd0044b1  main.cf
 a1778901dbc12de543d9d5897b9d50ee5ebe47b7ef6ed87a0087249657f146ff8493de455d32016660cca3c8d669592e0ea9fbe9b6696d92cac6f014277f29e5  pgsql-aliases.cf

config/postgresql/APKBUILD

@@ -1,14 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-postgresql
+_svcname=postgresql
+_configpath="/etc/postgresql/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.13
-pkgrel=0
-pkgdesc="PostgreSQL configuration files"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="postgresql postgresql-contrib"
-options="!check" # PostgreSQL doesn't have configuration checks
 source="
 	postgresql.conf
 	pg_hba.conf
@@ -16,10 +15,8 @@ source="
 "
 
 package() {
-	install -dm750 "$pkgdir"/var/lib/postgresql
-	install -Dm644 postgresql.conf "$pkgdir"/etc/postgresql/redxen/postgresql.conf
-	install -Dm644 pg_hba.conf "$pkgdir"/etc/postgresql/redxen/pg_hba.conf
-	install -Dm644 pg_ident.conf "$pkgdir"/etc/postgresql/redxen/pg_ident.conf
+	package_copy_configs
+	mkdir -p "$pkgdir"/var/lib/postgresql
 }
 
 sha512sums="ee33ef1dd1e2afaea8336e94fd754c3ed5eff7d312de233fbbbf8371d736b1bec03d8c436d8b9360e04048b4548c3d3d488ca940c63b8e5645d143298b9fce18  postgresql.conf

config/redis/APKBUILD

@@ -0,0 +1,16 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=redis
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.29
+pkgrel=1
+source="redxen.conf"
+
+package() {
+	package_copy_configs
+	install -dm700 "$pkgdir"/var/lib/redis
+}
+
+sha512sums="85b83fdec29dfe075aa2b4e79829b47ae42171a62878b3c69ca300a007d60e80634a92d62e646eb432aab5397c51c1f3ce406cfad3208d1e16cc5151711c4271  redxen.conf"

config/rspamd/APKBUILD

@@ -1,14 +1,13 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-rspamd
+_svcname=rspamd
+_configpath="/etc/rspamd/redxen"
+
+. ../APKBUILD-config.common
+
 pkgver=2021.02.05
-pkgrel=0
-pkgdesc="RSpamD configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="rspamd"
-source="
+pkgrel=1
+_baseconf="
 	rspamd.conf
 	composites.conf
 	groups.conf
@@ -16,8 +15,7 @@ source="
 	statistic.conf
 	workers.conf
 "
-options="!check"
-builddir="$srcdir"
+source="$_baseconf"
 _modules="
 	chartable
 	dkim
@@ -37,14 +35,8 @@ for i in $_modules; do
 	source="modules/$i.conf $source"
 done
 
-
 package() {
-	install -Dm644 rspamd.conf "$pkgdir"/etc/rspamd/redxen/rspamd.conf
-	install -Dm644 composites.conf "$pkgdir"/etc/rspamd/redxen/composites.conf
-	install -Dm644 groups.conf "$pkgdir"/etc/rspamd/redxen/groups.conf
-	install -Dm644 logging.conf "$pkgdir"/etc/rspamd/redxen/logging.conf
-	install -Dm644 statistic.conf "$pkgdir"/etc/rspamd/redxen/statistic.conf
-	install -Dm644 workers.conf "$pkgdir"/etc/rspamd/redxen/workers.conf
+	package_copy_configs "$_baseconf"
 }
 
 _module() {

config/sysctl/APKBUILD

@@ -1,25 +1,18 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-sysctl
+_svcname=sysctl
+_configpath="/etc/sysctl.d"
+
+. ../APKBUILD-config.common
+
 pkgver=2020.12.10
-pkgrel=0
-pkgdesc="sysctl settings for servers"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="openrc"
+pkgrel=1
+depends="busybox"
 source="
 	10-memory.conf
 	20-network.conf
 	30-kernel.conf
 "
-options="!check"
-
-package() {
-	install -Dm644 10-memory.conf "$pkgdir"/etc/sysctl.d/10-memory.conf
-	install -Dm644 20-network.conf "$pkgdir"/etc/sysctl.d/20-network.conf
-	install -Dm644 30-kernel.conf "$pkgdir"/etc/sysctl.d/30-kernel.conf
-}
 
 sha512sums="8043d419de52d0a8e75ed50643bd73ef3b3e2633d9064c6f6695b796834bc162f6b3c0e28082bb601e1a6c582e92ca90aa3dd626973c741c2ff0d3e1749521b1  10-memory.conf
 117648c1a0ee1a2d554eee2a0f8584097c66300dfda945a4ac0cb52f24160ae673abe3de964d419ddca4e0822a605c7b1d4f8d8e3f85d5f7c582b9803ffa21fc  20-network.conf

config/telegraf/APKBUILD

@@ -1,21 +1,14 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-telegraf
-pkgver=2020.12.23
-pkgrel=0
-pkgdesc="Telegraf monitoring configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="telegraf"
-source="
-	main.conf
-"
-#options="!check"
+_svcname=telegraf
+_cfgumask=400
 
-package() {
-	install -Dm400 main.conf "$pkgdir"/etc/telegraf/main.conf
-}
+. ../APKBUILD-config.common
+
+pkgver=2020.12.23
+pkgrel=1
+source="main.conf"
+options=""
 
 check() {
 	telegraf --config main.conf --test >/dev/null

config/transmission-daemon/APKBUILD

@@ -0,0 +1,18 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname="transmission-daemon"
+_configpath="/etc/transmission"
+_cfgumask=400
+
+. ../APKBUILD-config.common
+
+pkgver=2021.01.26
+pkgrel=1
+source="settings.json"
+
+package() {
+	package_copy_configs
+	mkdir -p "$pkgdir"/etc/transmission/resume "$pkgdir"/seedbox
+}
+
+sha512sums="6b6ca000655811ffdf1d51609cf0315f8516a7a7c0f602d97848071d6441bd13e053d896d9a56bc5c772b9c5ee600419480460db13dfdf03921e4d90a2a01887  settings.json"

config/unbound/APKBUILD

@@ -1,12 +1,11 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-unbound
+_svcname=unbound
+
+. ../APKBUILD-config.common
+
 pkgver=2021.01.30
-pkgrel=3
-pkgdesc="Unbound configurations"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=4
 depends="alpine-baselayout unbound ca-certificates-bundle dns-root-hints dnssec-root"
 checkdepends="bind-tools"
 subpackages="$pkgname-acl $pkgname-rctrl $pkgname-internal $pkgname-auth"
@@ -21,7 +20,6 @@ source="
 	zones/redxen.eu
 "
 options="checkroot"
-builddir="$srcdir"
 
 check() {
 	msg "Checking configuration validity"

config/varnish/APKBUILD

@@ -0,0 +1,11 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=varnish
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.07
+pkgrel=0
+source="main.vcl"
+
+sha512sums="6674a942017c0f1be2ff6eefb9f2a92a0f7d615e4ce367e880bceef0ec2646f3aac4180f2bb32557ac9ae8590b02882d05afbc7478bee9069a8138945e6835fc  main.vcl"

config/wireguard/APKBUILD

@@ -1,22 +1,25 @@
 # Contributor: Alex Denes <caskd@redxen.eu>
 # Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-wireguard
+_svcname=wireguard
+
+. ../APKBUILD-config.common
+
 pkgver=2021.02.07
-pkgrel=0
-pkgdesc="Wireguard tunnel configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
+pkgrel=1
 depends="wireguard-tools-wg wireguard-tools-wg-quick"
+subpackages="$pkgname-sysctl"
 source="
 	main.conf
 	sysctl.conf
 "
-options="!check"
 
 package() {
 	install -Dm400 main.conf "$pkgdir"/etc/wireguard/rxmain.conf
-	install -Dm644 sysctl.conf "$pkgdir"/etc/sysctl.d/90-wireguard.conf
+}
+
+sysctl() {
+	install_if="redxen-config-wireguard"
+	install -Dm644 "$srcdir"/sysctl.conf "$subpkgdir"/etc/sysctl.d/90-wireguard.conf
 }
 
 sha512sums="88f638dfe967b3bea88048eb978215d3e89e4a16ade9a8ee0acfd79f682bd0d8a8098ec3e9f8bbcb9b7d91e51008fff33619cbfca6488891005ec3bb75b851ad  main.conf

config/xonotic/APKBUILD

@@ -0,0 +1,13 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=xonotic
+_configpath="/etc/xonotic-server/redxen/data"
+
+. ../APKBUILD-config.common
+
+pkgver=2021.01.30
+pkgrel=6
+depends="xonotic-server"
+source="server.cfg"
+
+sha512sums="f875dc170b46d25914e2a1a09b0b1867f43c5eeea105931e5dd209a248e1a562d36541fc9d7f844f856d98a3adfb4dd1c66ebe6911fb2f15d7f56b7f3553a08b  server.cfg"

config/yggdrasil/APKBUILD

@@ -0,0 +1,12 @@
+# Contributor: Alex Denes <caskd@redxen.eu>
+# Maintainer: Alex Denes <caskd@redxen.eu>
+_svcname=yggdrasil
+_cfgumask=600
+
+. ../APKBUILD-config.common
+
+pkgver=2020.12.10
+pkgrel=1
+source="redxen.conf"
+
+sha512sums="630d13a1256257b804c37e167a08fa96e622d393bca1b2ec2f8f6f60f286b00954fa3ff07cd215e5835b18ef7fc8bedfc1d881303af80625936302f5d72b6496  redxen.conf"

configs/gitea/APKBUILD

@@ -1,21 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-gitea
-pkgver=2021.01.27
-pkgrel=0
-pkgdesc="Gitea configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="gitea redxen-data-gitea-theme"
-source="
-	gitea.ini
-"
-options="!check"
-
-package() {
-	install -dm755 "$pkgdir"/var/lib/gitea
-	install -Dm644 gitea.ini "$pkgdir"/etc/gitea/redxen.ini
-}
-
-sha512sums="41d387f28981777fa52581fe00549d15677bbafa232f82b504ed342ce188cdddabffbd9bb900ad7d0f5b73d7c4f78599715541f46b93b42b22f2f5077455c1eb  gitea.ini"

configs/grafana/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-grafana
-pkgver=2021.01.13
-pkgrel=2
-pkgdesc="Grafana configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="grafana"
-source="
-	grafana.ini
-"
-options="!check"
-
-package() {
-	install -Dm400 grafana.ini "$pkgdir"/etc/grafana/main.ini
-}
-
-sha512sums="90d7ac741be339613b325886ef485091c3f2662fc32e98a723935ef27838547ceea89ae4800d780b51411334264d5678c3431c3e4b3c34cfedd5373cba72ab62  grafana.ini"

configs/hitch/APKBUILD

@@ -1,23 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-hitch
-pkgver=2020.12.7
-pkgrel=0
-pkgdesc="Hitch frontend configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="hitch"
-source="main.conf"
-options="!check" # Certificate is not included in package
-
-check() {
-	hitch -t --config main.conf
-}
-
-package() {
-	install -Dm644 main.conf "$pkgdir"/etc/hitch/main.conf
-}
-
-
-sha512sums="b830c09953bd4908fd9d69c5e386b0f314b87d44bf2c19dcfa2bb5f790a842d617888e4c47802eaab8bea676bd1d060bae47965ac0946bbb9b5dc95ca990d01d  main.conf"

configs/influxdb/APKBUILD

@@ -1,21 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-influxdb
-pkgver=2020.12.29
-pkgrel=0
-pkgdesc="InfluxDB backend configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="influxdb"
-source="
-	influxdb.conf
-"
-options="!check"
-
-package() {
-	install -dm700 "$pkgdir"/var/lib/influxdb
-	install -Dm644 influxdb.conf "$pkgdir"/etc/influxdb/redxen.conf
-}
-
-sha512sums="e251c8e25fb0d4a258f17425d277553d65a0b4b078c60ceec973bb421fdda42130d0e9cb38a70a85f5258407b02219ce9f79e551908a9f8e593a00852f5f81b4  influxdb.conf"

configs/redis/APKBUILD

@@ -1,21 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-redis
-pkgver=2020.12.29
-pkgrel=0
-pkgdesc="Redis backend configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="redis"
-source="
-	redis.conf
-"
-options="!check" # Redis doesn't have a configuration test tool
-
-package() {
-	install -dm700 "$pkgdir"/var/lib/redis
-	install -Dm644 redis.conf "$pkgdir"/etc/redis/redxen.conf
-}
-
-sha512sums="85b83fdec29dfe075aa2b4e79829b47ae42171a62878b3c69ca300a007d60e80634a92d62e646eb432aab5397c51c1f3ce406cfad3208d1e16cc5151711c4271  redis.conf"

configs/transmission-daemon/APKBUILD

@@ -1,21 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-transmission-daemon
-pkgver=2021.01.26
-pkgrel=0
-pkgdesc="Transmission configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="transmission-daemon"
-source="main.json"
-options="!check"
-
-package() {
-	install -dm755 "$pkgdir"/seedbox
-	install -dm700 "$pkgdir"/etc/transmission
-	install -dm700 "$pkgdir"/etc/transmission/resume # Required by transmission, don't ask
-	install -Dm400 main.json "$pkgdir"/etc/transmission/settings.json
-}
-
-sha512sums="6b6ca000655811ffdf1d51609cf0315f8516a7a7c0f602d97848071d6441bd13e053d896d9a56bc5c772b9c5ee600419480460db13dfdf03921e4d90a2a01887  main.json"

configs/varnish/APKBUILD

@@ -1,19 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-varnish
-pkgver=2020.12.7
-pkgrel=0
-pkgdesc="Varnish cache frontend configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-source="main.vcl"
-depends="varnish"
-options="!check" # Varnish doesn't have a way to test configs
-
-package() {
-	install -Dm644 main.vcl "$pkgdir"/etc/varnish/main.vcl
-}
-
-
-sha512sums="6674a942017c0f1be2ff6eefb9f2a92a0f7d615e4ce367e880bceef0ec2646f3aac4180f2bb32557ac9ae8590b02882d05afbc7478bee9069a8138945e6835fc  main.vcl"

configs/xonotic/APKBUILD

@@ -1,21 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-xonotic
-pkgver=2021.01.30
-pkgrel=5
-pkgdesc="Xonotic server configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="xonotic-server"
-source="
-	xonotic.cfg
-"
-options="!check"
-builddir="$srcdir"
-
-package() {
-	install -Dm644 xonotic.cfg "$pkgdir"/etc/xonotic-server/redxen/data/server.cfg
-}
-
-sha512sums="f875dc170b46d25914e2a1a09b0b1867f43c5eeea105931e5dd209a248e1a562d36541fc9d7f844f856d98a3adfb4dd1c66ebe6911fb2f15d7f56b7f3553a08b  xonotic.cfg"

configs/yggdrasil/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Alex Denes <caskd@redxen.eu>
-# Maintainer: Alex Denes <caskd@redxen.eu>
-pkgname=redxen-config-yggdrasil
-pkgver=2020.12.10
-pkgrel=0
-pkgdesc="Yggdrasil tunnel configuration"
-url="https://git.redxen.eu/RedXen"
-arch="noarch"
-license="none"
-depends="yggdrasil"
-source="
-	redxen.conf
-"
-options="!check"
-
-package() {
-	install -Dm600 redxen.conf "$pkgdir"/etc/yggdrasil/redxen.conf
-}
-
-sha512sums="630d13a1256257b804c37e167a08fa96e622d393bca1b2ec2f8f6f60f286b00954fa3ff07cd215e5835b18ef7fc8bedfc1d881303af80625936302f5d72b6496  redxen.conf"