diff --git a/.gitignore b/.gitignore index f3e94e2..4775079 100644 --- a/.gitignore +++ b/.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 diff --git a/PORT-ALLOCATION b/PORT-ALLOCATION index a57d702..3d6e218 100644 --- a/PORT-ALLOCATION +++ b/PORT-ALLOCATION @@ -38,6 +38,9 @@ Public ports: Dovecot: IMAP: 143 +TLS: 993 + CRXN: + FastD: 2190 + BabelD: 6696 Xonotic: 26000 Transmission: 51413 Wireguard: 51820 diff --git a/config/APKBUILD-config.common b/config/APKBUILD-config.common new file mode 100644 index 0000000..7e8dbc7 --- /dev/null +++ b/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 +} + diff --git a/configs/dovecot/APKBUILD b/config/dovecot/APKBUILD similarity index 66% rename from configs/dovecot/APKBUILD rename to config/dovecot/APKBUILD index 4ad290e..1c60d72 100644 --- a/configs/dovecot/APKBUILD +++ b/config/dovecot/APKBUILD @@ -1,24 +1,21 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 } diff --git a/configs/dovecot/README.md b/config/dovecot/README.md similarity index 100% rename from configs/dovecot/README.md rename to config/dovecot/README.md diff --git a/configs/dovecot/base.sql b/config/dovecot/base.sql similarity index 100% rename from configs/dovecot/base.sql rename to config/dovecot/base.sql diff --git a/configs/dovecot/dovecot.conf b/config/dovecot/dovecot.conf similarity index 100% rename from configs/dovecot/dovecot.conf rename to config/dovecot/dovecot.conf diff --git a/configs/dovecot/redxen-config-dovecot.pre-install b/config/dovecot/redxen-config-dovecot.pre-install similarity index 100% rename from configs/dovecot/redxen-config-dovecot.pre-install rename to config/dovecot/redxen-config-dovecot.pre-install diff --git a/config/gitea/APKBUILD b/config/gitea/APKBUILD new file mode 100644 index 0000000..7776de3 --- /dev/null +++ b/config/gitea/APKBUILD @@ -0,0 +1,17 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/config/grafana/APKBUILD b/config/grafana/APKBUILD new file mode 100644 index 0000000..4def88a --- /dev/null +++ b/config/grafana/APKBUILD @@ -0,0 +1,12 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_svcname=grafana +_cfgumask=400 + +. ../APKBUILD-config.common + +pkgver=2021.01.13 +pkgrel=3 +source="main.ini" + +sha512sums="90d7ac741be339613b325886ef485091c3f2662fc32e98a723935ef27838547ceea89ae4800d780b51411334264d5678c3431c3e4b3c34cfedd5373cba72ab62 main.ini" diff --git a/configs/haproxy/APKBUILD b/config/haproxy/APKBUILD similarity index 50% rename from configs/haproxy/APKBUILD rename to config/haproxy/APKBUILD index 052682e..d2f22a3 100644 --- a/configs/haproxy/APKBUILD +++ b/config/haproxy/APKBUILD @@ -1,24 +1,16 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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" diff --git a/configs/haproxy/main.cfg b/config/haproxy/main.cfg similarity index 100% rename from configs/haproxy/main.cfg rename to config/haproxy/main.cfg diff --git a/config/hitch/APKBUILD b/config/hitch/APKBUILD new file mode 100644 index 0000000..103c2ae --- /dev/null +++ b/config/hitch/APKBUILD @@ -0,0 +1,15 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/configs/hitch/main.conf b/config/hitch/main.conf similarity index 100% rename from configs/hitch/main.conf rename to config/hitch/main.conf diff --git a/config/influxdb/APKBUILD b/config/influxdb/APKBUILD new file mode 100644 index 0000000..a75b479 --- /dev/null +++ b/config/influxdb/APKBUILD @@ -0,0 +1,16 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/configs/influxdb/influxdb.conf b/config/influxdb/redxen.conf similarity index 100% rename from configs/influxdb/influxdb.conf rename to config/influxdb/redxen.conf diff --git a/configs/ipset/APKBUILD b/config/ipset/APKBUILD similarity index 56% rename from configs/ipset/APKBUILD rename to config/ipset/APKBUILD index 5b8c6ae..474b9de 100644 --- a/configs/ipset/APKBUILD +++ b/config/ipset/APKBUILD @@ -1,24 +1,16 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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" diff --git a/configs/ipset/netwide4 b/config/ipset/netwide4 similarity index 100% rename from configs/ipset/netwide4 rename to config/ipset/netwide4 diff --git a/configs/ipset/netwide6 b/config/ipset/netwide6 similarity index 100% rename from configs/ipset/netwide6 rename to config/ipset/netwide6 diff --git a/configs/iptables/APKBUILD b/config/iptables/APKBUILD similarity index 53% rename from configs/iptables/APKBUILD rename to config/iptables/APKBUILD index b02fe23..2e0fca3 100644 --- a/configs/iptables/APKBUILD +++ b/config/iptables/APKBUILD @@ -1,24 +1,16 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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" diff --git a/configs/iptables/rules-v4 b/config/iptables/rx-rules4 similarity index 100% rename from configs/iptables/rules-v4 rename to config/iptables/rx-rules4 diff --git a/configs/iptables/rules-v6 b/config/iptables/rx-rules6 similarity index 100% rename from configs/iptables/rules-v6 rename to config/iptables/rx-rules6 diff --git a/configs/lighttpd/APKBUILD b/config/lighttpd/APKBUILD similarity index 53% rename from configs/lighttpd/APKBUILD rename to config/lighttpd/APKBUILD index e880f5c..75b91d0 100644 --- a/configs/lighttpd/APKBUILD +++ b/config/lighttpd/APKBUILD @@ -1,20 +1,18 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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() { diff --git a/configs/lighttpd/main.conf b/config/lighttpd/main.conf similarity index 100% rename from configs/lighttpd/main.conf rename to config/lighttpd/main.conf diff --git a/configs/murmur/APKBUILD b/config/murmur/APKBUILD similarity index 56% rename from configs/murmur/APKBUILD rename to config/murmur/APKBUILD index 3eaf4d0..b19c4ab 100644 --- a/configs/murmur/APKBUILD +++ b/config/murmur/APKBUILD @@ -1,21 +1,14 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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" diff --git a/configs/murmur/redxen-config-murmur.pre-install b/config/murmur/redxen-config-murmur.pre-install similarity index 100% rename from configs/murmur/redxen-config-murmur.pre-install rename to config/murmur/redxen-config-murmur.pre-install diff --git a/configs/nginx/APKBUILD b/config/nginx/APKBUILD similarity index 89% rename from configs/nginx/APKBUILD rename to config/nginx/APKBUILD index 7bc0c2a..d7b7cb7 100644 --- a/configs/nginx/APKBUILD +++ b/config/nginx/APKBUILD @@ -1,12 +1,11 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/nginx/main.conf b/config/nginx/main.conf similarity index 100% rename from configs/nginx/main.conf rename to config/nginx/main.conf diff --git a/configs/nginx/modules/alpine.conf b/config/nginx/modules/alpine.conf similarity index 100% rename from configs/nginx/modules/alpine.conf rename to config/nginx/modules/alpine.conf diff --git a/configs/nginx/modules/homepage.conf b/config/nginx/modules/homepage.conf similarity index 100% rename from configs/nginx/modules/homepage.conf rename to config/nginx/modules/homepage.conf diff --git a/configs/nginx/modules/seedbox.conf b/config/nginx/modules/seedbox.conf similarity index 100% rename from configs/nginx/modules/seedbox.conf rename to config/nginx/modules/seedbox.conf diff --git a/configs/opendkim/APKBUILD b/config/opendkim/APKBUILD similarity index 89% rename from configs/opendkim/APKBUILD rename to config/opendkim/APKBUILD index 6f85689..fd72833 100644 --- a/configs/opendkim/APKBUILD +++ b/config/opendkim/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Alex Denes # Maintainer: Alex Denes 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 diff --git a/configs/opendkim/key_table b/config/opendkim/key_table similarity index 100% rename from configs/opendkim/key_table rename to config/opendkim/key_table diff --git a/configs/opendkim/opendkim.conf b/config/opendkim/opendkim.conf similarity index 100% rename from configs/opendkim/opendkim.conf rename to config/opendkim/opendkim.conf diff --git a/configs/opendkim/signing_table b/config/opendkim/signing_table similarity index 100% rename from configs/opendkim/signing_table rename to config/opendkim/signing_table diff --git a/configs/opendkim/trusted_hosts b/config/opendkim/trusted_hosts similarity index 100% rename from configs/opendkim/trusted_hosts rename to config/opendkim/trusted_hosts diff --git a/configs/openssh-sftp-seedbox/APKBUILD b/config/openssh-sftp-seedbox/APKBUILD similarity index 80% rename from configs/openssh-sftp-seedbox/APKBUILD rename to config/openssh-sftp-seedbox/APKBUILD index 53c8043..a8e9335 100644 --- a/configs/openssh-sftp-seedbox/APKBUILD +++ b/config/openssh-sftp-seedbox/APKBUILD @@ -1,18 +1,16 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/openssh-sftp-seedbox/allowed_keys b/config/openssh-sftp-seedbox/allowed_keys similarity index 100% rename from configs/openssh-sftp-seedbox/allowed_keys rename to config/openssh-sftp-seedbox/allowed_keys diff --git a/configs/openssh-sftp-seedbox/seedbox-conf b/config/openssh-sftp-seedbox/seedbox-conf similarity index 100% rename from configs/openssh-sftp-seedbox/seedbox-conf rename to config/openssh-sftp-seedbox/seedbox-conf diff --git a/configs/postfix/APKBUILD b/config/postfix/APKBUILD similarity index 66% rename from configs/postfix/APKBUILD rename to config/postfix/APKBUILD index 7b99159..531edbd 100644 --- a/configs/postfix/APKBUILD +++ b/config/postfix/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/postfix/main.cf b/config/postfix/main.cf similarity index 100% rename from configs/postfix/main.cf rename to config/postfix/main.cf diff --git a/configs/postfix/master.cf b/config/postfix/master.cf similarity index 100% rename from configs/postfix/master.cf rename to config/postfix/master.cf diff --git a/configs/postfix/redxen-config-postfix.pre-install b/config/postfix/redxen-config-postfix.pre-install similarity index 100% rename from configs/postfix/redxen-config-postfix.pre-install rename to config/postfix/redxen-config-postfix.pre-install diff --git a/configs/postgresql/APKBUILD b/config/postgresql/APKBUILD similarity index 57% rename from configs/postgresql/APKBUILD rename to config/postgresql/APKBUILD index 077c120..e777e7d 100644 --- a/configs/postgresql/APKBUILD +++ b/config/postgresql/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/postgresql/pg_hba.conf b/config/postgresql/pg_hba.conf similarity index 100% rename from configs/postgresql/pg_hba.conf rename to config/postgresql/pg_hba.conf diff --git a/configs/postgresql/pg_ident.conf b/config/postgresql/pg_ident.conf similarity index 100% rename from configs/postgresql/pg_ident.conf rename to config/postgresql/pg_ident.conf diff --git a/configs/postgresql/postgresql.conf b/config/postgresql/postgresql.conf similarity index 100% rename from configs/postgresql/postgresql.conf rename to config/postgresql/postgresql.conf diff --git a/config/redis/APKBUILD b/config/redis/APKBUILD new file mode 100644 index 0000000..67af4cc --- /dev/null +++ b/config/redis/APKBUILD @@ -0,0 +1,16 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/configs/redis/redis.conf b/config/redis/redxen.conf similarity index 100% rename from configs/redis/redis.conf rename to config/redis/redxen.conf diff --git a/configs/rspamd/APKBUILD b/config/rspamd/APKBUILD similarity index 82% rename from configs/rspamd/APKBUILD rename to config/rspamd/APKBUILD index 76472b1..cd2ed2d 100644 --- a/configs/rspamd/APKBUILD +++ b/config/rspamd/APKBUILD @@ -1,14 +1,13 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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() { diff --git a/configs/rspamd/composites.conf b/config/rspamd/composites.conf similarity index 100% rename from configs/rspamd/composites.conf rename to config/rspamd/composites.conf diff --git a/configs/rspamd/groups.conf b/config/rspamd/groups.conf similarity index 100% rename from configs/rspamd/groups.conf rename to config/rspamd/groups.conf diff --git a/configs/rspamd/logging.conf b/config/rspamd/logging.conf similarity index 100% rename from configs/rspamd/logging.conf rename to config/rspamd/logging.conf diff --git a/configs/rspamd/modules/chartable.conf b/config/rspamd/modules/chartable.conf similarity index 100% rename from configs/rspamd/modules/chartable.conf rename to config/rspamd/modules/chartable.conf diff --git a/configs/rspamd/modules/dkim.conf b/config/rspamd/modules/dkim.conf similarity index 100% rename from configs/rspamd/modules/dkim.conf rename to config/rspamd/modules/dkim.conf diff --git a/configs/rspamd/modules/dmarc.conf b/config/rspamd/modules/dmarc.conf similarity index 100% rename from configs/rspamd/modules/dmarc.conf rename to config/rspamd/modules/dmarc.conf diff --git a/configs/rspamd/modules/greylist.conf b/config/rspamd/modules/greylist.conf similarity index 100% rename from configs/rspamd/modules/greylist.conf rename to config/rspamd/modules/greylist.conf diff --git a/configs/rspamd/modules/maillist.conf b/config/rspamd/modules/maillist.conf similarity index 100% rename from configs/rspamd/modules/maillist.conf rename to config/rspamd/modules/maillist.conf diff --git a/configs/rspamd/modules/milter_headers.conf b/config/rspamd/modules/milter_headers.conf similarity index 100% rename from configs/rspamd/modules/milter_headers.conf rename to config/rspamd/modules/milter_headers.conf diff --git a/configs/rspamd/modules/phishing.conf b/config/rspamd/modules/phishing.conf similarity index 100% rename from configs/rspamd/modules/phishing.conf rename to config/rspamd/modules/phishing.conf diff --git a/configs/rspamd/modules/rbl.conf b/config/rspamd/modules/rbl.conf similarity index 100% rename from configs/rspamd/modules/rbl.conf rename to config/rspamd/modules/rbl.conf diff --git a/configs/rspamd/modules/redis.conf b/config/rspamd/modules/redis.conf similarity index 100% rename from configs/rspamd/modules/redis.conf rename to config/rspamd/modules/redis.conf diff --git a/configs/rspamd/modules/spf.conf b/config/rspamd/modules/spf.conf similarity index 100% rename from configs/rspamd/modules/spf.conf rename to config/rspamd/modules/spf.conf diff --git a/configs/rspamd/rspamd.conf b/config/rspamd/rspamd.conf similarity index 100% rename from configs/rspamd/rspamd.conf rename to config/rspamd/rspamd.conf diff --git a/configs/rspamd/statistic.conf b/config/rspamd/statistic.conf similarity index 100% rename from configs/rspamd/statistic.conf rename to config/rspamd/statistic.conf diff --git a/configs/rspamd/workers.conf b/config/rspamd/workers.conf similarity index 100% rename from configs/rspamd/workers.conf rename to config/rspamd/workers.conf diff --git a/configs/sysctl/10-memory.conf b/config/sysctl/10-memory.conf similarity index 100% rename from configs/sysctl/10-memory.conf rename to config/sysctl/10-memory.conf diff --git a/configs/sysctl/20-network.conf b/config/sysctl/20-network.conf similarity index 100% rename from configs/sysctl/20-network.conf rename to config/sysctl/20-network.conf diff --git a/configs/sysctl/30-kernel.conf b/config/sysctl/30-kernel.conf similarity index 100% rename from configs/sysctl/30-kernel.conf rename to config/sysctl/30-kernel.conf diff --git a/configs/sysctl/APKBUILD b/config/sysctl/APKBUILD similarity index 60% rename from configs/sysctl/APKBUILD rename to config/sysctl/APKBUILD index 66aabe0..8432e73 100644 --- a/configs/sysctl/APKBUILD +++ b/config/sysctl/APKBUILD @@ -1,25 +1,18 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/telegraf/APKBUILD b/config/telegraf/APKBUILD similarity index 53% rename from configs/telegraf/APKBUILD rename to config/telegraf/APKBUILD index 390237e..d9ca85f 100644 --- a/configs/telegraf/APKBUILD +++ b/config/telegraf/APKBUILD @@ -1,21 +1,14 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/telegraf/main.conf b/config/telegraf/main.conf similarity index 100% rename from configs/telegraf/main.conf rename to config/telegraf/main.conf diff --git a/config/transmission-daemon/APKBUILD b/config/transmission-daemon/APKBUILD new file mode 100644 index 0000000..f9a44ad --- /dev/null +++ b/config/transmission-daemon/APKBUILD @@ -0,0 +1,18 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/configs/unbound/APKBUILD b/config/unbound/APKBUILD similarity index 93% rename from configs/unbound/APKBUILD rename to config/unbound/APKBUILD index 44f81ae..1d8a9c8 100644 --- a/configs/unbound/APKBUILD +++ b/config/unbound/APKBUILD @@ -1,12 +1,11 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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" diff --git a/configs/unbound/acl.conf b/config/unbound/acl.conf similarity index 100% rename from configs/unbound/acl.conf rename to config/unbound/acl.conf diff --git a/configs/unbound/auth-zones.conf b/config/unbound/auth-zones.conf similarity index 100% rename from configs/unbound/auth-zones.conf rename to config/unbound/auth-zones.conf diff --git a/configs/unbound/base.conf b/config/unbound/base.conf similarity index 100% rename from configs/unbound/base.conf rename to config/unbound/base.conf diff --git a/configs/unbound/includes.conf b/config/unbound/includes.conf similarity index 100% rename from configs/unbound/includes.conf rename to config/unbound/includes.conf diff --git a/configs/unbound/internal.conf b/config/unbound/internal.conf similarity index 100% rename from configs/unbound/internal.conf rename to config/unbound/internal.conf diff --git a/configs/unbound/rctrl.conf b/config/unbound/rctrl.conf similarity index 100% rename from configs/unbound/rctrl.conf rename to config/unbound/rctrl.conf diff --git a/configs/unbound/zones/redxen.eu b/config/unbound/zones/redxen.eu similarity index 100% rename from configs/unbound/zones/redxen.eu rename to config/unbound/zones/redxen.eu diff --git a/config/varnish/APKBUILD b/config/varnish/APKBUILD new file mode 100644 index 0000000..7de6021 --- /dev/null +++ b/config/varnish/APKBUILD @@ -0,0 +1,11 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_svcname=varnish + +. ../APKBUILD-config.common + +pkgver=2020.12.07 +pkgrel=0 +source="main.vcl" + +sha512sums="6674a942017c0f1be2ff6eefb9f2a92a0f7d615e4ce367e880bceef0ec2646f3aac4180f2bb32557ac9ae8590b02882d05afbc7478bee9069a8138945e6835fc main.vcl" diff --git a/configs/varnish/main.vcl b/config/varnish/main.vcl similarity index 100% rename from configs/varnish/main.vcl rename to config/varnish/main.vcl diff --git a/configs/wireguard/APKBUILD b/config/wireguard/APKBUILD similarity index 70% rename from configs/wireguard/APKBUILD rename to config/wireguard/APKBUILD index 0ae04c5..3c0dc3c 100644 --- a/configs/wireguard/APKBUILD +++ b/config/wireguard/APKBUILD @@ -1,22 +1,25 @@ # Contributor: Alex Denes # Maintainer: Alex Denes -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 diff --git a/configs/wireguard/sysctl.conf b/config/wireguard/sysctl.conf similarity index 100% rename from configs/wireguard/sysctl.conf rename to config/wireguard/sysctl.conf diff --git a/config/xonotic/APKBUILD b/config/xonotic/APKBUILD new file mode 100644 index 0000000..dab2ed5 --- /dev/null +++ b/config/xonotic/APKBUILD @@ -0,0 +1,13 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_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" diff --git a/configs/xonotic/xonotic.cfg b/config/xonotic/server.cfg similarity index 100% rename from configs/xonotic/xonotic.cfg rename to config/xonotic/server.cfg diff --git a/config/yggdrasil/APKBUILD b/config/yggdrasil/APKBUILD new file mode 100644 index 0000000..7bab9d2 --- /dev/null +++ b/config/yggdrasil/APKBUILD @@ -0,0 +1,12 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_svcname=yggdrasil +_cfgumask=600 + +. ../APKBUILD-config.common + +pkgver=2020.12.10 +pkgrel=1 +source="redxen.conf" + +sha512sums="630d13a1256257b804c37e167a08fa96e622d393bca1b2ec2f8f6f60f286b00954fa3ff07cd215e5835b18ef7fc8bedfc1d881303af80625936302f5d72b6496 redxen.conf" diff --git a/configs/yggdrasil/redxen.conf b/config/yggdrasil/redxen.conf similarity index 100% rename from configs/yggdrasil/redxen.conf rename to config/yggdrasil/redxen.conf diff --git a/configs/gitea/APKBUILD b/configs/gitea/APKBUILD deleted file mode 100644 index f20f02e..0000000 --- a/configs/gitea/APKBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/grafana/APKBUILD b/configs/grafana/APKBUILD deleted file mode 100644 index f1b0294..0000000 --- a/configs/grafana/APKBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/hitch/APKBUILD b/configs/hitch/APKBUILD deleted file mode 100644 index 4b4e1e4..0000000 --- a/configs/hitch/APKBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/influxdb/APKBUILD b/configs/influxdb/APKBUILD deleted file mode 100644 index d13c2f7..0000000 --- a/configs/influxdb/APKBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/redis/APKBUILD b/configs/redis/APKBUILD deleted file mode 100644 index 7a7c387..0000000 --- a/configs/redis/APKBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/transmission-daemon/APKBUILD b/configs/transmission-daemon/APKBUILD deleted file mode 100644 index 75d7d62..0000000 --- a/configs/transmission-daemon/APKBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/varnish/APKBUILD b/configs/varnish/APKBUILD deleted file mode 100644 index d62c354..0000000 --- a/configs/varnish/APKBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/xonotic/APKBUILD b/configs/xonotic/APKBUILD deleted file mode 100644 index 4ad9077..0000000 --- a/configs/xonotic/APKBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/configs/yggdrasil/APKBUILD b/configs/yggdrasil/APKBUILD deleted file mode 100644 index 8f743bb..0000000 --- a/configs/yggdrasil/APKBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -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" diff --git a/secrets/letsencrypt/APKBUILD b/secret/letsencrypt/APKBUILD similarity index 100% rename from secrets/letsencrypt/APKBUILD rename to secret/letsencrypt/APKBUILD diff --git a/secrets/letsencrypt/ca.pem b/secret/letsencrypt/ca.pem similarity index 100% rename from secrets/letsencrypt/ca.pem rename to secret/letsencrypt/ca.pem diff --git a/secrets/letsencrypt/redxen-secret-letsencrypt-full.pre-install b/secret/letsencrypt/redxen-secret-letsencrypt-full.pre-install similarity index 100% rename from secrets/letsencrypt/redxen-secret-letsencrypt-full.pre-install rename to secret/letsencrypt/redxen-secret-letsencrypt-full.pre-install diff --git a/secrets/letsencrypt/redxen-secret-letsencrypt-private.pre-install b/secret/letsencrypt/redxen-secret-letsencrypt-private.pre-install similarity index 100% rename from secrets/letsencrypt/redxen-secret-letsencrypt-private.pre-install rename to secret/letsencrypt/redxen-secret-letsencrypt-private.pre-install diff --git a/secrets/letsencrypt/redxen-secret-letsencrypt.pre-install b/secret/letsencrypt/redxen-secret-letsencrypt.pre-install similarity index 100% rename from secrets/letsencrypt/redxen-secret-letsencrypt.pre-install rename to secret/letsencrypt/redxen-secret-letsencrypt.pre-install diff --git a/secrets/selfsigned/APKBUILD b/secret/selfsigned/APKBUILD similarity index 100% rename from secrets/selfsigned/APKBUILD rename to secret/selfsigned/APKBUILD diff --git a/secrets/selfsigned/redxen-secret-selfsigned-fullchain.pre-install b/secret/selfsigned/redxen-secret-selfsigned-fullchain.pre-install similarity index 100% rename from secrets/selfsigned/redxen-secret-selfsigned-fullchain.pre-install rename to secret/selfsigned/redxen-secret-selfsigned-fullchain.pre-install diff --git a/secrets/selfsigned/redxen-secret-selfsigned-private.pre-install b/secret/selfsigned/redxen-secret-selfsigned-private.pre-install similarity index 100% rename from secrets/selfsigned/redxen-secret-selfsigned-private.pre-install rename to secret/selfsigned/redxen-secret-selfsigned-private.pre-install diff --git a/secrets/selfsigned/redxen-secret-selfsigned.pre-install b/secret/selfsigned/redxen-secret-selfsigned.pre-install similarity index 100% rename from secrets/selfsigned/redxen-secret-selfsigned.pre-install rename to secret/selfsigned/redxen-secret-selfsigned.pre-install