Add binary deps to service and add configuration addition deps to config

This commit is contained in:
Alex D. 2021-02-09 19:11:29 +00:00
parent 2dc270f4e9
commit a5fc5dfdc6
Signed by: caskd
GPG Key ID: F92BA85F61F4C173
52 changed files with 79 additions and 100 deletions

View File

@ -5,7 +5,6 @@ arch="noarch"
license="none"
pkgdesc="RedXen service config for $_svcname"
options="!check"
depends="$_svcname"
builddir="$srcdir"
package_copy_configs() {

View File

@ -6,8 +6,8 @@ _configpath="/etc/dovecot/redxen"
. ../APKBUILD-config.common
pkgver=2021.01.17
pkgrel=1
depends="dovecot dovecot-lmtpd dovecot-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
pkgrel=2
depends="dovecot-lmtpd dovecot-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
install="$pkgname.pre-install"
source="
dovecot.conf

View File

@ -6,8 +6,8 @@ _cfgumask=400
. ../APKBUILD-config.common
pkgver=2021.02.08
pkgrel=0
pkgver=2021.02.09
pkgrel=1
subpackages="$pkgname-crxnrouter" # $pkgname-crxnclient" TODO
source="
crxn-router.conf
@ -19,11 +19,13 @@ package() {
}
crxnrouter() {
install -Dm400 crxn-router.conf "$subpkgdir"/"$_configpath"/crxn-router.conf
provides="redxen-config-fastd"
install -Dm400 crxn-router.conf "$subpkgdir"/"$_configpath"/crxn.conf
}
crxnclient() {
install -Dm400 crxn-client.conf "$subpkgdir"/"$_configpath"/crxn-client.conf
provides="redxen-config-fastd"
install -Dm400 crxn-client.conf "$subpkgdir"/"$_configpath"/crxn.conf
}
sha512sums="f0c4dfd3c0cd6c00ece98f3be9c8b70c1654713167da20f12d9867737d9f98b7ee0286ad311e9bf31536d44632ba9dc4b659d9d42c047dba0a14169b32f3849c crxn-router.conf"

View File

@ -5,8 +5,8 @@ _svcname=gitea
. ../APKBUILD-config.common
pkgver=2021.01.27
pkgrel=1
depends="gitea redxen-data-gitea-theme"
pkgrel=2
depends="redxen-data-gitea-theme"
source="redxen.ini"
package() {

View File

@ -6,7 +6,7 @@ _cfgumask=400
. ../APKBUILD-config.common
pkgver=2021.01.13
pkgrel=3
pkgrel=4
source="main.ini"
sha512sums="90d7ac741be339613b325886ef485091c3f2662fc32e98a723935ef27838547ceea89ae4800d780b51411334264d5678c3431c3e4b3c34cfedd5373cba72ab62 main.ini"

View File

@ -5,8 +5,9 @@ _svcname=haproxy
. ../APKBUILD-config.common
pkgver=2021.01.30
pkgrel=1
depends="haproxy redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
pkgrel=2
depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
#checkdepends="haproxy"
source="main.cfg"
#check() {

View File

@ -4,9 +4,10 @@ _svcname=hitch
. ../APKBUILD-config.common
pkgver=2020.12.7
pkgrel=1
pkgver=2020.12.07
pkgrel=0
source="main.conf"
#checkdepends="hitch"
#check() {
# hitch -t --config main.conf # Certificate not readable by the building user

View File

@ -5,7 +5,7 @@ _svcname=influxdb
. ../APKBUILD-config.common
pkgver=2020.12.29
pkgrel=1
pkgrel=2
source="redxen.conf"
package() {

View File

@ -6,7 +6,7 @@ _configpath="/etc/ipset.d/redxen"
. ../APKBUILD-config.common
pkgver=2021.01.28
pkgrel=2
pkgrel=3
source="
netwide4
netwide6

View File

@ -5,8 +5,8 @@ _svcname=iptables
. ../APKBUILD-config.common
pkgver=2021.01.28
pkgrel=3
depends="iptables ip6tables redxen-config-ipset"
pkgrel=4
depends="redxen-config-ipset"
source="
rx-rules4
rx-rules6

View File

@ -6,9 +6,10 @@ _configpath="/etc/lighttpd/redxen"
. ../APKBUILD-config.common
pkgver=2020.12.11
pkgrel=1
pkgrel=2
source="main.conf"
options="" # Default options
checkdepends="lighttpd"
package() {
package_copy_configs

View File

@ -6,8 +6,8 @@ _cfgumask=400
. ../APKBUILD-config.common
pkgver=2021.01.30
pkgrel=1
depends="murmur qt5-qtbase-postgresql redxen-secret-selfsigned-public redxen-secret-selfsigned-private"
pkgrel=2
depends="qt5-qtbase-postgresql redxen-secret-selfsigned-public redxen-secret-selfsigned-private"
source="murmur.ini"
install="$pkgname.pre-install"

View File

@ -5,8 +5,9 @@ _svcname=nginx
. ../APKBUILD-config.common
pkgver=2021.01.26
pkgrel=1
depends="nginx nginx-mod-http-zip"
pkgrel=2
depends="nginx-mod-http-zip"
checkdepends="nginx"
subpackages="$pkgname-seedbox $pkgname-alpine $pkgname-homepage"
source="
main.conf

View File

@ -4,9 +4,9 @@ _svcname=opendkim
. ../APKBUILD-config.common
pkgver="2021.02.08"
pkgver=2021.02.08
pkgrel=3
depends="opendkim redxen-secret-opendkim~$pkgver"
depends="redxen-secret-opendkim~$pkgver"
makedepends="opendkim-utils"
source="
trusted_hosts

View File

@ -5,8 +5,7 @@ _svcname=openssh-sftp-seedbox
. ../APKBUILD-config.common
pkgver=2020.12.07
pkgrel=0
depends="openssh"
pkgrel=1
source="
seedbox-conf
allowed_keys

View File

@ -6,8 +6,8 @@ _configpath="/etc/postfix/redxen"
. ../APKBUILD-config.common
pkgver=2021.01.27
pkgrel=1
depends="postfix postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
pkgrel=2
depends="postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
install="$pkgname.pre-install"
source="
master.cf

View File

@ -6,8 +6,8 @@ _configpath="/etc/postgresql/redxen"
. ../APKBUILD-config.common
pkgver=2021.01.13
pkgrel=1
depends="postgresql postgresql-contrib"
pkgrel=2
depends="postgresql-contrib"
source="
postgresql.conf
pg_hba.conf

View File

@ -5,7 +5,7 @@ _svcname=redis
. ../APKBUILD-config.common
pkgver=2020.12.29
pkgrel=1
pkgrel=2
source="redxen.conf"
package() {

View File

@ -6,7 +6,7 @@ _configpath="/etc/rspamd/redxen"
. ../APKBUILD-config.common
pkgver=2021.02.05
pkgrel=1
pkgrel=2
_baseconf="
rspamd.conf
composites.conf

View File

@ -6,7 +6,7 @@ _configpath="/etc/sysctl.d"
. ../APKBUILD-config.common
pkgver=2020.12.10
pkgrel=1
pkgrel=2
depends="busybox"
source="
10-memory.conf

View File

@ -6,8 +6,9 @@ _cfgumask=400
. ../APKBUILD-config.common
pkgver=2020.12.23
pkgrel=1
pkgrel=2
source="main.conf"
checkdepends="telegraf"
options=""
check() {

View File

@ -7,7 +7,7 @@ _cfgumask=400
. ../APKBUILD-config.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
source="settings.json"
package() {

View File

@ -5,10 +5,10 @@ _svcname=unbound
. ../APKBUILD-config.common
pkgver=2021.02.08
pkgrel=0
depends="alpine-baselayout unbound ca-certificates-bundle dns-root-hints dnssec-root"
pkgrel=1
depends="alpine-baselayout ca-certificates-bundle dns-root-hints dnssec-root"
makedepends="redxen-secret-opendkim-dns"
checkdepends="bind-tools"
checkdepends="bind-tools unbound"
subpackages="$pkgname-acl $pkgname-rctrl $pkgname-internal $pkgname-auth"
source="
includes.conf

View File

@ -5,7 +5,7 @@ _svcname=varnish
. ../APKBUILD-config.common
pkgver=2020.12.07
pkgrel=0
pkgrel=1
source="main.vcl"
sha512sums="6674a942017c0f1be2ff6eefb9f2a92a0f7d615e4ce367e880bceef0ec2646f3aac4180f2bb32557ac9ae8590b02882d05afbc7478bee9069a8138945e6835fc main.vcl"

View File

@ -5,8 +5,7 @@ _svcname=wireguard
. ../APKBUILD-config.common
pkgver=2021.02.07
pkgrel=1
depends="wireguard-tools-wg wireguard-tools-wg-quick"
pkgrel=2
subpackages="$pkgname-sysctl"
source="
main.conf

View File

@ -6,8 +6,7 @@ _configpath="/etc/xonotic-server/redxen/data"
. ../APKBUILD-config.common
pkgver=2021.01.30
pkgrel=6
depends="xonotic-server"
pkgrel=7
source="server.cfg"
sha512sums="f875dc170b46d25914e2a1a09b0b1867f43c5eeea105931e5dd209a248e1a562d36541fc9d7f844f856d98a3adfb4dd1c66ebe6911fb2f15d7f56b7f3553a08b server.cfg"

View File

@ -6,7 +6,7 @@ _cfgumask=600
. ../APKBUILD-config.common
pkgver=2020.12.10
pkgrel=1
pkgrel=2
source="redxen.conf"
sha512sums="630d13a1256257b804c37e167a08fa96e622d393bca1b2ec2f8f6f60f286b00954fa3ff07cd215e5835b18ef7fc8bedfc1d881303af80625936302f5d72b6496 redxen.conf"

View File

@ -2,7 +2,7 @@ pkgname=redxen-openrc-$_svcname
url="https://git.redxen.eu/RedXen/aports"
arch="noarch"
license="none"
depends="openrc redxen-config-$_svcname"
depends="openrc $_svcname redxen-config-$_svcname"
pkgdesc="RedXen service config for $_svcname"
source="runfile conffile"
options="!check"

View File

@ -6,7 +6,7 @@ _grpname=network
. ../APKBUILD-openrc.common
pkgver=2021.02.08
pkgrel=0
pkgrel=1
sha512sums="3a77457b76f95a75e33d40f59dd32f464e834d207200cf3e84b82fe78dde74156fb642daaab8bb92fa6bed96ca48d1d0dd41983efcde87ac0e3fcfe5aa7eea25 runfile
fd128c27307877871989e026c382cb0c1d486d30f7b4928616bde1cbabe24ab4fc3aa83f33dbe42f2321318807c8d9f913b1fea089c1a38f3a3200214682b9b8 conffile"

View File

@ -6,7 +6,7 @@ _grpname=mail
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="04efce688cf54ab643cbf29dafe264c70f3a2c6f2e7fe9030d1e7f3e4d30656c718796fb55d3d9c02422e2298172475efd91b31b4ca6108508a636f2ff242963 runfile
612aecfe0c233264ab2cdc4e4545dd0e89500672057ffb86f8798141f3a767ed64bae375a55defa202353588d89757b3b3224d63e827a006210a87540888970f conffile"

View File

@ -5,35 +5,8 @@ _grpname=network
. ../APKBUILD-openrc.common
pkgver=2021.02.08
pkgrel=4
subpackages="$pkgname-crxnrouter" # $pkgname-crxnclient" # TODO
depends=""
source="
runfile
"
pkgver=2021.02.09
pkgrel=1
build() {
echo "FASTD_CONF=\"/etc/fastd/redxen/crxn-router.conf\"" > conffile.crxnrouter
echo "FASTD_CONF=\"/etc/fastd/redxen/crxn-client.conf\"" > conffile.crxnclient
}
package() {
openrc_rx_install_runfile
}
crxnrouter() {
depends="redxen-config-$_svcname-crxnrouter"
openrc_rx_add_to_runlevel "$subpkgdir" "fastd.crxnrouter.redxen"
openrc_rx_link_instance "$subpkgdir" "$_svcname" "fastd.crxnrouter.redxen"
openrc_rx_install_conffile "$subpkgdir" "$builddir"/"conffile.crxnrouter" "fastd.crxnrouter.redxen"
}
crxnclient() {
depends="redxen-config-$_svcname-crxnrouter"
openrc_rx_add_to_runlevel "$subpkgdir" "fastd.crxnrouter.redxen"
openrc_rx_link_instance "$subpkgdir" "$_svcname" "fastd.crxnclient.redxen"
openrc_rx_install_conffile "$subpkgdir" "$builddir"/"conffile.crxnclient" "fastd.crxnclient.redxen"
}
sha512sums="68699b730ca24994227c4487f5046e433ba82e475b9f586755e525f9b6c7da7346f6ac04bb17d370bfed7121bb660f11a8e243169e25af391f6d1e87928d9d77 runfile"
sha512sums="68699b730ca24994227c4487f5046e433ba82e475b9f586755e525f9b6c7da7346f6ac04bb17d370bfed7121bb660f11a8e243169e25af391f6d1e87928d9d77 runfile
577bf722d5fe5dc093f48b1d893f9c987045d30f3c64e5f22f2366ab6974786615068a29bd50f729149d8e2603b98ab705888a6e8c51a0838ae93990ae62dd26 conffile"

1
openrc/fastd/conffile Normal file
View File

@ -0,0 +1 @@
FASTD_CONF="/etc/fastd/redxen/crxn.conf"

View File

@ -6,7 +6,7 @@ _grpname=git
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="bc341c2ebaa77ed1a2ce8c75f42fa163071ff7d8af49c7263dac278fef333e974aa62b25443002a95daa105543d0e92921a8056fe97e4f1fce8a3ac97270006c runfile
958773d7921fb92d30c9f30894d78b08785afcd64318f8d49654b27483ed653fe32a9ac482a19202b1f3bebebadaf4f87392dab068faac81b77fe4f5f5d60906 conffile"

View File

@ -6,7 +6,7 @@ _grpname=monitoring
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="ff2ff799efbe2aa46610206fd51f487f079ebde4f63653937d7c438fd1e77d0549cd13598b6c37b65d1fad1fdba175fefb4de3712782967a3d73ce5581159c30 runfile
830c14991b818e7ab121dfdf2e0fea4434e4c464bb03784312f421fc752811e22e9412e893217eae482d6a8f956118832e5129441c5fc814c4f7b4c85ec51e29 conffile"

View File

@ -6,7 +6,7 @@ _grpname=http
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=database
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="bc850c5a53510801435ee700a80d204a084d773b94bbb6f3aa39744d3a88f3b189596dc8d4c618c4d9c97cb8d26ec50608bfaa6a78550c5b86c146c96e744460 runfile
fff28c21ece16bce375ffe7790655de498f067e71ffdbc880e6b3b0adc28707cac167a5a53dd4aab73e5a5664300d165a6e9d2718a4b49482bbfc52e42d67594 conffile"

View File

@ -6,7 +6,7 @@ _grpname=firewall
. ../APKBUILD-openrc.common
pkgver=2021.01.28
pkgrel=0
pkgrel=1
sha512sums="6dc3532dbd408f20b1327c711a4b8c220df1c00d69c07a5368b5da83d591f24002745e4d128b0152a41e6edc9d70a86fc43cd01089e9d0f3deea3997cd07a435 runfile
da4d6b72a8e7114d44903a46455642f69ac44a51e0bf0b7bafc8b469398419128bba830c1e5c0759618784f301d07c220be98fa01eb1d3ffe72bc36768aa3472 conffile"

View File

@ -6,13 +6,14 @@ _grpname=firewall
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=2
pkgrel=3
source="
runfile-4
runfile-6
conffile-4
conffile-6
"
depends="iptables ip6tables redxen-config-$_svcname openrc"
package() {
openrc_rx_add_to_runlevel "$pkgdir" "iptables.redxen"

View File

@ -6,7 +6,7 @@ _grpname=http
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=social
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="0bca5004e9422e1e4cb87741d81ee32e7e7b939ea8e948d6496cf200a94b471f78219302d55f0419bd3361d9b62af5db3b36bdd9c173eafe20c44c21bfa42463 runfile
a413a468528c615c283be6012e4d77d6dfb3db42279bd065e2eba17eca8892624d8815483e7f6e7e9583928702bb50c7cad394959d39637560f690f92738b849 conffile"

View File

@ -6,7 +6,7 @@ _grpname=http
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=mail
. ../APKBUILD-openrc.common
pkgver=2021.02.08
pkgrel=3
pkgrel=4
sha512sums="2d506bfb74cdc9fe70c96ae4a9db4ee8a4347ce6e268d267cf35892c2d4979afe3fb4e6258c86bdfa29043918e663efea71e94dee932bf763f25250c22738e65 runfile
c6fa8c88593350419ab536423ee3f5e556b9ba54439cc123ad0a3ddb52335349951eb06b5903a0b923d8c24f8b220087abae275b4cbada14e3d6f1af61aa5813 conffile"

View File

@ -6,7 +6,7 @@ _grpname=mail
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="f810dcb32530c60c48f813a5a6741763bbf34b4d1cac961cdab9eb3e072174a982040a93319aef08b3dc74de209ed2b082228a39757742f0077cacb7eba3c906 runfile
9da3af881cc36690434b9a0809edad205478f4e4e2cba5c5a2d04de701141d38ac16c0942c1cdf242d5a81bf9a580bdd8166e74fa31b51227bbaf6fa8afd8cb9 conffile"

View File

@ -6,7 +6,7 @@ _grpname=database
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=database
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=mail
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,7 +6,7 @@ _grpname=monitoring
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="63b5accc922c617632940fdb35c813f43199dc2d19c89b079dbbd1502ef771aef9e5261ecebc57d5335d6c567a18889474c21b5498690b1ad690719da0a9a93e runfile
a7950b7fa3c5c8303c387a743591afb5d3b6a4d25c88e5d7522667b8cfdd8cdbad55251152efec352241ffd3d78ce56a5d3b6fbef03a2b02d0b23833547649c7 conffile"

View File

@ -6,7 +6,7 @@ _grpname=seedbox
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
sha512sums="22c65c1b3a719107a486c1d62fc6321e6e775f08a00ed07c98a0b847bd02d14420fa79424011175a8a6eed1acea0ca832fdee00321999b771e556ce7b58ba2b7 runfile
c1df27bb036e28ea94c5fa18b40c99a96d9548c28ed8262ad753744a1737883c9fd75fbae2284ea9ad749bd9d4d5ee0b33a1876dccb3008e0ee327de29922ac7 conffile"

View File

@ -6,7 +6,7 @@ _grpname=dns
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"

View File

@ -6,8 +6,8 @@ _grpname=network
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
depends="openrc redxen-config-$_svcname wireguard-tools-wg-quick"
pkgrel=2
depends="openrc redxen-config-$_svcname wireguard-tools-wg-quick wireguard-tools-wg"
sha512sums="efa8c4ce0e15d9184edfa8cf8940e1d63f19933df0034cc27e86eb659095d069f43174cb3d1bdb2b1361e1a31d0b871589906f30113019bced2537c9e3432bfc runfile
543998954d42cc51677b37495d91436b3506dc4e92082a3eba6a0d3791d176ef98db52002bbb98022451b01f477c1dc36022697cd80f8d7a133e90736b624243 conffile"

View File

@ -6,7 +6,8 @@ _grpname=games
. ../APKBUILD-openrc.common
pkgver=2021.01.29
pkgrel=0
pkgrel=1
depends="openrc redxen-config-$_svcname xonotic-server"
sha512sums="d5b3cb34992af61b25cd331e454b95eb1c3b69137afbe06faf08fc1eaf47dda373c97442a59d862b2a2ebb41aa365bcc0e2d21b83657cfdb3a72d9502856c632 runfile
cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e conffile"

View File

@ -6,7 +6,7 @@ _grpname=network
. ../APKBUILD-openrc.common
pkgver=2021.01.26
pkgrel=1
pkgrel=2
depends="$depends $_svcname-openrc"
source="conffile"