From 3e8fd15544e8d8c95db067e4bd62b39e89a655f4 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 1 Nov 2020 15:28:32 +0100 Subject: [PATCH] Progress so far --- .gitignore | 2 + lxc-configs/haproxy-redxen-lxc/APKBUILD | 22 ------- lxc-configs/haproxy-redxen-lxc/config | 13 ---- .../haproxy-redxen-lxc.post-deinstall | 3 - .../haproxy-redxen-lxc.post-install | 3 - lxc-configs/hitch-redxen-lxc/APKBUILD | 22 ------- lxc-configs/hitch-redxen-lxc/config | 12 ---- .../hitch-redxen-lxc.post-deinstall | 3 - .../hitch-redxen-lxc.post-install | 3 - lxc-configs/unbound-redxen-lxc/APKBUILD | 22 ------- lxc-configs/unbound-redxen-lxc/config | 12 ---- .../unbound-redxen-lxc.post-deinstall | 3 - .../unbound-redxen-lxc.post-install | 3 - lxc-configs/varnish-redxen-lxc/APKBUILD | 22 ------- lxc-configs/varnish-redxen-lxc/config | 12 ---- .../varnish-redxen-lxc.post-deinstall | 3 - .../varnish-redxen-lxc.post-install | 3 - openrc-configs/haproxy-redxen-openrc/APKBUILD | 22 +++++++ openrc-configs/haproxy-redxen-openrc/conffile | 6 ++ openrc-configs/haproxy-redxen-openrc/runfile | 6 ++ openrc-configs/murmur-redxen-openrc/APKBUILD | 22 +++++++ openrc-configs/murmur-redxen-openrc/conffile | 6 ++ openrc-configs/murmur-redxen-openrc/runfile | 8 +++ openrc-configs/unbound-redxen-openrc/APKBUILD | 22 +++++++ openrc-configs/unbound-redxen-openrc/conffile | 6 ++ openrc-configs/unbound-redxen-openrc/runfile | 6 ++ .../haproxy-redxen-config/APKBUILD | 19 +++--- .../haproxy-redxen-config/main.cfg | 60 +----------------- .../murmur-redxen-config/.internal.conf.swp | Bin 0 -> 12288 bytes .../murmur-redxen-config/.redxen-dns.conf.swp | Bin 0 -> 12288 bytes .../murmur-redxen-config/APKBUILD | 21 ++++++ .../unbound-redxen-config/APKBUILD | 4 +- .../unbound-redxen-config/base.conf | 3 +- .../unbound-redxen-config/internal.conf | 11 ++++ .../varnish-redxen-config/APKBUILD | 2 +- .../varnish-redxen-config/main.vcl | 4 +- 36 files changed, 159 insertions(+), 232 deletions(-) create mode 100644 .gitignore delete mode 100644 lxc-configs/haproxy-redxen-lxc/APKBUILD delete mode 100644 lxc-configs/haproxy-redxen-lxc/config delete mode 100644 lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-deinstall delete mode 100644 lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-install delete mode 100644 lxc-configs/hitch-redxen-lxc/APKBUILD delete mode 100644 lxc-configs/hitch-redxen-lxc/config delete mode 100644 lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-deinstall delete mode 100644 lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-install delete mode 100644 lxc-configs/unbound-redxen-lxc/APKBUILD delete mode 100644 lxc-configs/unbound-redxen-lxc/config delete mode 100644 lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-deinstall delete mode 100644 lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-install delete mode 100644 lxc-configs/varnish-redxen-lxc/APKBUILD delete mode 100644 lxc-configs/varnish-redxen-lxc/config delete mode 100644 lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-deinstall delete mode 100644 lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-install create mode 100644 openrc-configs/haproxy-redxen-openrc/APKBUILD create mode 100644 openrc-configs/haproxy-redxen-openrc/conffile create mode 100644 openrc-configs/haproxy-redxen-openrc/runfile create mode 100644 openrc-configs/murmur-redxen-openrc/APKBUILD create mode 100644 openrc-configs/murmur-redxen-openrc/conffile create mode 100644 openrc-configs/murmur-redxen-openrc/runfile create mode 100644 openrc-configs/unbound-redxen-openrc/APKBUILD create mode 100644 openrc-configs/unbound-redxen-openrc/conffile create mode 100644 openrc-configs/unbound-redxen-openrc/runfile create mode 100644 software-configs/murmur-redxen-config/.internal.conf.swp create mode 100644 software-configs/murmur-redxen-config/.redxen-dns.conf.swp create mode 100644 software-configs/murmur-redxen-config/APKBUILD diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f691c1f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +software-configs/murmur-redxen-config/murmur.ini +software-configs/haproxy-redxen-config/cert.pem diff --git a/lxc-configs/haproxy-redxen-lxc/APKBUILD b/lxc-configs/haproxy-redxen-lxc/APKBUILD deleted file mode 100644 index 9043b60..0000000 --- a/lxc-configs/haproxy-redxen-lxc/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=haproxy-redxen-lxc -pkgver=1 -pkgrel=0 -pkgdesc="HAProxy LXC configuration files" -url="https://git.redxen.eu/RedXen" -arch="noarch" -license="none" -depends="lxc" -options="!check" -install="$pkgname.post-install $pkgname.post-deinstall" -source=" - config -" - -package() { - install -dm755 "$pkgdir"/containers/haproxy - install -Dm644 config "$pkgdir"/var/lib/lxc/haproxy/config -} - -sha512sums="9f4137aca385dbb62370babfa9a50ca82cd4a27453a6939d3f5236150ef8d18f09817ff008ddd21afc247cb0337b3e5415b499f0a384df286de03e3fd5d51725 config" diff --git a/lxc-configs/haproxy-redxen-lxc/config b/lxc-configs/haproxy-redxen-lxc/config deleted file mode 100644 index b0a52b5..0000000 --- a/lxc-configs/haproxy-redxen-lxc/config +++ /dev/null @@ -1,13 +0,0 @@ -lxc.net.0.type = none -lxc.rootfs.path = dir:/containers/haproxy -lxc.init.cmd = /usr/sbin/haproxy -Wf /etc/haproxy/main.cfg -p /run/haproxy.pid -lxc.signal.halt = SIGTERM -lxc.signal.reboot = SIGTERM -lxc.tty.max = 1 -lxc.pty.max = 1 -lxc.cap.drop = sys_module mac_admin mac_override sys_time -lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed -lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0 -lxc.mount.entry = tmpfs run tmpfs defaults,create=dir 0 0 -lxc.mount.entry = mqueue dev/mqueue mqueue defaults,optional,create=dir 0 0 -lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0 diff --git a/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-deinstall b/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-deinstall deleted file mode 100644 index 3b24336..0000000 --- a/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/bin/rm /containers/haproxy -rf diff --git a/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-install b/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-install deleted file mode 100644 index 388c69b..0000000 --- a/lxc-configs/haproxy-redxen-lxc/haproxy-redxen-lxc.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/apk --allow-untrusted -p /containers/haproxy -X http://dl-cdn.alpinelinux.org/alpine/edge/main -X http://dl-cdn.alpinelinux.org/alpine/edge/community -X https://redxen.eu/pub/alpine/software-configs add --initdb haproxy-redxen-config diff --git a/lxc-configs/hitch-redxen-lxc/APKBUILD b/lxc-configs/hitch-redxen-lxc/APKBUILD deleted file mode 100644 index 4646728..0000000 --- a/lxc-configs/hitch-redxen-lxc/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=hitch-redxen-lxc -pkgver=1 -pkgrel=0 -pkgdesc="Hitch LXC configuration files" -url="https://git.redxen.eu/RedXen" -arch="noarch" -license="none" -depends="lxc" -options="!check" -install="$pkgname.post-install $pkgname.post-deinstall" -source=" - config -" - -package() { - install -dm755 "$pkgdir"/containers/hitch - install -Dm644 config "$pkgdir"/var/lib/lxc/hitch/config -} - -sha512sums="3ffa1ad21c273a248a8d7884b32216bf4fe565d27fac9a5787a9ce14adfa04739cd2cd41871d3a79923d76a358a377ea1d71284f807434e5a5dfa0d46204ae82 config" diff --git a/lxc-configs/hitch-redxen-lxc/config b/lxc-configs/hitch-redxen-lxc/config deleted file mode 100644 index 3f30e92..0000000 --- a/lxc-configs/hitch-redxen-lxc/config +++ /dev/null @@ -1,12 +0,0 @@ -lxc.net.0.type = none -lxc.rootfs.path = dir:/containers/hitch -lxc.init.cmd = /usr/sbin/hitch --config=/etc/hitch/main.conf -lxc.signal.halt = SIGTERM -lxc.signal.reboot = SIGTERM -lxc.tty.max = 1 -lxc.pty.max = 1 -lxc.cap.drop = sys_module mac_admin mac_override sys_time -lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed -lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0 -lxc.mount.entry = mqueue dev/mqueue mqueue defaults,optional,create=dir 0 0 -lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0 diff --git a/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-deinstall b/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-deinstall deleted file mode 100644 index a32c56f..0000000 --- a/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/bin/rm /containers/hitch -rf diff --git a/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-install b/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-install deleted file mode 100644 index 67097a4..0000000 --- a/lxc-configs/hitch-redxen-lxc/hitch-redxen-lxc.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/apk --allow-untrusted -p /containers/hitch -X http://dl-cdn.alpinelinux.org/alpine/edge/main -X http://dl-cdn.alpinelinux.org/alpine/edge/community -X https://redxen.eu/pub/alpine/software-configs add --initdb hitch-redxen-config diff --git a/lxc-configs/unbound-redxen-lxc/APKBUILD b/lxc-configs/unbound-redxen-lxc/APKBUILD deleted file mode 100644 index ced294d..0000000 --- a/lxc-configs/unbound-redxen-lxc/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=unbound-redxen-lxc -pkgver=1 -pkgrel=0 -pkgdesc="Unbound LXC configuration files" -url="https://git.redxen.eu/RedXen" -arch="noarch" -license="none" -depends="lxc" -options="!check" -install="$pkgname.post-install $pkgname.post-deinstall" -source=" - config -" - -package() { - install -dm755 "$pkgdir"/containers/unbound - install -Dm644 config "$pkgdir"/var/lib/lxc/unbound/config -} - -sha512sums="8f0200fb4f116fbc330ca42c54f86b7abed3eb69f8b7a91028f05e47348408fb7d67c8ffa2ceabfa6715ad4ae44c1873ad917ce5f288be1a779db9852ddb9110 config" diff --git a/lxc-configs/unbound-redxen-lxc/config b/lxc-configs/unbound-redxen-lxc/config deleted file mode 100644 index 5ddd605..0000000 --- a/lxc-configs/unbound-redxen-lxc/config +++ /dev/null @@ -1,12 +0,0 @@ -lxc.net.0.type = none -lxc.rootfs.path = dir:/containers/unbound -lxc.init.cmd = /usr/sbin/unbound -c /etc/unbound/main.conf -lxc.signal.halt = SIGTERM -lxc.signal.reboot = SIGTERM -lxc.tty.max = 1 -lxc.pty.max = 1 -lxc.cap.drop = sys_module mac_admin mac_override sys_time -lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed -lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0 -lxc.mount.entry = mqueue dev/mqueue mqueue defaults,optional,create=dir 0 0 -lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0 diff --git a/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-deinstall b/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-deinstall deleted file mode 100644 index 71e9b40..0000000 --- a/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/bin/rm /containers/unbound -rf diff --git a/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-install b/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-install deleted file mode 100644 index 4892053..0000000 --- a/lxc-configs/unbound-redxen-lxc/unbound-redxen-lxc.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/apk --allow-untrusted -p /containers/unbound -X http://dl-cdn.alpinelinux.org/alpine/edge/main -X http://dl-cdn.alpinelinux.org/alpine/edge/community -X https://redxen.eu/pub/alpine/software-configs add --initdb unbound-redxen-config diff --git a/lxc-configs/varnish-redxen-lxc/APKBUILD b/lxc-configs/varnish-redxen-lxc/APKBUILD deleted file mode 100644 index 7eb0b5f..0000000 --- a/lxc-configs/varnish-redxen-lxc/APKBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=varnish-redxen-lxc -pkgver=1 -pkgrel=0 -pkgdesc="Varnish LXC configuration files" -url="https://git.redxen.eu/RedXen" -arch="noarch" -license="none" -depends="lxc" -options="!check" -install="$pkgname.post-install $pkgname.post-deinstall" -source=" - config -" - -package() { - install -dm755 "$pkgdir"/containers/varnish - install -Dm644 config "$pkgdir"/var/lib/lxc/varnish/config -} - -sha512sums="6bfa0290eba1925b4f6635c1ee2d8eda3b18a0fdc286bbecd86ea98dbc7480125ae0026ecbc2c73c3d074abcf7b6143f3337be121e8160054624d304c17281ed config" diff --git a/lxc-configs/varnish-redxen-lxc/config b/lxc-configs/varnish-redxen-lxc/config deleted file mode 100644 index d2a7841..0000000 --- a/lxc-configs/varnish-redxen-lxc/config +++ /dev/null @@ -1,12 +0,0 @@ -lxc.net.0.type = none -lxc.rootfs.path = dir:/containers/varnish -lxc.init.cmd = /usr/sbin/varnishd -F -a :7102,PROXY -p default_ttl=300 -p default_grace=240 -p default_keep=120 -p feature=+http2 -p tcp_fastopen=on -p nuke_limit=0 -f /etc/varnish/main.vcl -lxc.signal.halt = SIGTERM -lxc.signal.reboot = SIGTERM -lxc.tty.max = 1 -lxc.pty.max = 1 -lxc.cap.drop = sys_module mac_admin mac_override sys_time -lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed -lxc.mount.entry = shm dev/shm tmpfs defaults,create=dir 0 0 -lxc.mount.entry = mqueue dev/mqueue mqueue defaults,optional,create=dir 0 0 -lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0 diff --git a/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-deinstall b/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-deinstall deleted file mode 100644 index 82799b0..0000000 --- a/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/bin/rm /containers/varnish -rf diff --git a/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-install b/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-install deleted file mode 100644 index a653e87..0000000 --- a/lxc-configs/varnish-redxen-lxc/varnish-redxen-lxc.post-install +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/apk --allow-untrusted -p /containers/varnish -X http://dl-cdn.alpinelinux.org/alpine/edge/main -X http://dl-cdn.alpinelinux.org/alpine/edge/community -X https://redxen.eu/pub/alpine/software-configs add --initdb varnish-redxen-config diff --git a/openrc-configs/haproxy-redxen-openrc/APKBUILD b/openrc-configs/haproxy-redxen-openrc/APKBUILD new file mode 100644 index 0000000..ba732ca --- /dev/null +++ b/openrc-configs/haproxy-redxen-openrc/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +pkgname=haproxy-redxen-openrc +pkgver=1 +pkgrel=0 +pkgdesc="HAProxy OpenRC service files" +url="https://git.redxen.eu/RedXen" +arch="noarch" +license="none" +depends="openrc haproxy-redxen-config" +source=" + runfile + conffile +" +options="!check" + +package() { + install -Dm755 runfile "$pkgdir"/etc/init.d/haproxy-redxen + install -Dm644 conffile "$pkgdir"/etc/conf.d/haproxy-redxen +} +sha512sums="3f9a179d756d65cd739badce185fe335d7743a37f81e38c2577ca51209c1f3921ffe19046deb599d832d53687ecd3faa1f9889e33f07d9ada15344ce0a86fd33 runfile +169316df39a2e6eb01117985c7cea3b8a0b0a5f1f9fd2e13ec8a3d7d2be7205f610ef9a4d00f989d9430a4865194d1854170bdeb1793de2b8009d864c1330c8a conffile" diff --git a/openrc-configs/haproxy-redxen-openrc/conffile b/openrc-configs/haproxy-redxen-openrc/conffile new file mode 100644 index 0000000..9ff2d4e --- /dev/null +++ b/openrc-configs/haproxy-redxen-openrc/conffile @@ -0,0 +1,6 @@ + +# Configuration file to start with +CONF="main.cfg" + +# Extra options +EXTRA_OPTS="-C /etc/haproxy" diff --git a/openrc-configs/haproxy-redxen-openrc/runfile b/openrc-configs/haproxy-redxen-openrc/runfile new file mode 100644 index 0000000..1c52c41 --- /dev/null +++ b/openrc-configs/haproxy-redxen-openrc/runfile @@ -0,0 +1,6 @@ +#!/sbin/openrc-run + +description="Start OpenRC service for HAProxy" +command="/usr/sbin/haproxy" +pidfile="/run/haproxy.pid" +command_args="-D -p ${pidfile} -f ${CONF} ${EXTRA_OPTS}" diff --git a/openrc-configs/murmur-redxen-openrc/APKBUILD b/openrc-configs/murmur-redxen-openrc/APKBUILD new file mode 100644 index 0000000..59b474b --- /dev/null +++ b/openrc-configs/murmur-redxen-openrc/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +pkgname=murmur-redxen-openrc +pkgver=1 +pkgrel=0 +pkgdesc="Murmur OpenRC service files" +url="https://git.redxen.eu/RedXen" +arch="noarch" +license="none" +depends="openrc murmur-redxen-config" +source=" + runfile + conffile +" +options="!check" + +package() { + install -Dm755 runfile "$pkgdir"/etc/init.d/murmur-redxen + install -Dm644 conffile "$pkgdir"/etc/conf.d/murmur-redxen +} +sha512sums="5c6ecf55d22c0b37d8af2b1158484369faa54eb2df9da9b5c734fadedb4fe3345c577ffd267bc3a5e60a224f59d24d52f5159a90ffec92785df5e5052860eaf3 runfile +ce487bcbf14b6875bae9fbbdd9d2e847b6606a33c78498631abf131283716f6db94daece70813f842f9167f48a39555ff9cdf13a4223de65a013a9fe4e43a9e9 conffile" diff --git a/openrc-configs/murmur-redxen-openrc/conffile b/openrc-configs/murmur-redxen-openrc/conffile new file mode 100644 index 0000000..0941d5a --- /dev/null +++ b/openrc-configs/murmur-redxen-openrc/conffile @@ -0,0 +1,6 @@ + +# Configuration file to start with +CONF="/etc/murmur/murmur.ini" + +# Extra options +EXTRA_OPTS="" diff --git a/openrc-configs/murmur-redxen-openrc/runfile b/openrc-configs/murmur-redxen-openrc/runfile new file mode 100644 index 0000000..0926d73 --- /dev/null +++ b/openrc-configs/murmur-redxen-openrc/runfile @@ -0,0 +1,8 @@ +#!/sbin/openrc-run + +description="Start OpenRC service for Murmur" +command="/usr/bin/murmurd" +command_args="-ini ${CONF} ${EXTRA_OPTS}" +pidfile="/run/murmur.pid" +supervisor=supervise-daemon +command_background=true diff --git a/openrc-configs/unbound-redxen-openrc/APKBUILD b/openrc-configs/unbound-redxen-openrc/APKBUILD new file mode 100644 index 0000000..4d4c8a6 --- /dev/null +++ b/openrc-configs/unbound-redxen-openrc/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +pkgname=unbound-redxen-openrc +pkgver=1 +pkgrel=0 +pkgdesc="Unbound OpenRC service files" +url="https://git.redxen.eu/RedXen" +arch="noarch" +license="none" +depends="openrc unbound-redxen-config" +source=" + runfile + conffile +" +options="!check" + +package() { + install -Dm755 runfile "$pkgdir"/etc/init.d/unbound-redxen + install -Dm644 conffile "$pkgdir"/etc/conf.d/unbound-redxen +} +sha512sums="78abad5f8d6e8fae7e563cfe772ae57bd284cca35aea6db12ba6afb234d34d95bba534e23cf7275e95011d4a7ccabadce714483b2d9286d9cbe92acf8cd98e9b runfile +ac23baec2a74f5c866b0afa7bf09958f348b2bca9a44755f8e07cbc251bc8770b51e76f2a8d3469cacfaa81ff7708de223e5ba1f2625eda7c72cb618a0b907ad conffile" diff --git a/openrc-configs/unbound-redxen-openrc/conffile b/openrc-configs/unbound-redxen-openrc/conffile new file mode 100644 index 0000000..eb9c764 --- /dev/null +++ b/openrc-configs/unbound-redxen-openrc/conffile @@ -0,0 +1,6 @@ + +# Configuration file to start with +CONF="/etc/unbound/main.conf" + +# Extra options +EXTRA_OPTS="" diff --git a/openrc-configs/unbound-redxen-openrc/runfile b/openrc-configs/unbound-redxen-openrc/runfile new file mode 100644 index 0000000..75e3e82 --- /dev/null +++ b/openrc-configs/unbound-redxen-openrc/runfile @@ -0,0 +1,6 @@ +#!/sbin/openrc-run + +description="Start OpenRC service for Unbound" +command="/usr/sbin/unbound" +command_args="-c ${CONF} ${EXTRA_OPTS}" +pidfile="/run/unbound.pid" diff --git a/software-configs/haproxy-redxen-config/APKBUILD b/software-configs/haproxy-redxen-config/APKBUILD index 677455f..2bb6921 100644 --- a/software-configs/haproxy-redxen-config/APKBUILD +++ b/software-configs/haproxy-redxen-config/APKBUILD @@ -8,16 +8,19 @@ url="https://git.redxen.eu/RedXen" arch="noarch" license="none" depends="haproxy" -source="main.cfg" +source=" + main.cfg + cert.pem +" + +package() { + install -Dm644 main.cfg "$pkgdir"/etc/haproxy/main.cfg + install -Dm400 cert.pem "$pkgdir"/etc/haproxy/cert.pem +} check() { haproxy -c -f main.cfg } -package() { - install -d "$pkgdir"/etc/haproxy - install -Dm644 *.cfg "$pkgdir"/etc/haproxy -} - - -sha512sums="33d7b52a068edc80311ab7437d74928cc21812d830166e94de170c8f2ce7eab42a665631cf06efc39c525d7bfff78a85754633b8b5b5f2f49c108b9a60501e43 main.cfg" +sha512sums="aca02946028ab884700c45028bec1e08144bd02a90edb394afc56a2e88a8fcd82672313e9dc9100a5bd8711047e5dbd1b83a8d9df03fe1625d68f49efbe0add3 main.cfg +3cd81a03287793d2b52aca54c0ba3d702d3d4af34c2ca7e36d39f46309403873424a2c64a899c79139890556c038197bf491da20ce5fba1e01e3bdd3a81132cb cert.pem" diff --git a/software-configs/haproxy-redxen-config/main.cfg b/software-configs/haproxy-redxen-config/main.cfg index 3c22d46..51d77b4 100644 --- a/software-configs/haproxy-redxen-config/main.cfg +++ b/software-configs/haproxy-redxen-config/main.cfg @@ -36,74 +36,20 @@ resolvers local hold timeout 3s hold valid 5s -listen 0-dev - mode tcp - bind ipv4@*:2442,ipv6@*:2442 - option tcp-check - server dev-0 10.0.0.10:2443 - -listen 1-social +listen mumble mode tcp bind ipv4@*:64738,ipv6@*:64738 option tcp-check - server social-0 10.0.0.10:6401 - -listen 2-games - mode tcp - bind ipv4@*:25565,ipv6@*:25565 - option tcp-check - server games-0 10.0.0.7:25560 - -listen 3-games - mode tcp - bind ipv4@*:7777,ipv6@*:7777 - option tcp-check - server games-0 10.0.0.7:7776 + server-template mumble 1 mumble.routinginfo.redxen.localhost frontend http mode http - bind /haproxy.sock mode 660 alpn h2,http/1.1 + bind ipv4@:443,ipv6@:443 ssl crt cert.pem alpn h2,http/1.1 acl root url / - use_backend backend-grafana if { hdr_beg(host) -i stats } - use_backend backend-gitea if { hdr_beg(host) -i git } - use_backend backend-transmission if { hdr_beg(host) -i seed } - use_backend backend-seedown if { hdr_beg(host) -i sd } - use_backend backend-pleroma if { hdr_beg(host) -i social } - use_backend backend-homepage if { hdr(host) -i redxen.eu } - use_backend backend-deavmi-proxy if { hdr_beg(host) -i deavmi-proxy } - - redirect prefix /web code 302 if { hdr_beg(host) -i seed } { url / } http-response add-header X-Forwarded-Proto https http-response set-header X-XSS-Protection 1;\ mode=block http-response set-header X-Content-Type-Options nosniff http-response set-header Referrer-Policy no-referrer-when-downgrade http-response set-header Strict-Transport-Security max-age=31536000;\ includeSubDomains;\ preload - -backend backend-grafana - server-template grafana 5 _grafana._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ stats.redxen.eu - -backend backend-gitea - server-template gitea 1 _gitea._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ git.redxen.eu - -backend backend-transmission - server-template transmission 1 _transmission._tcp.redxen.localhost - -backend backend-seedown - server-template seedown 1 _seedown._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ sd.redxen.eu - -backend backend-pleroma - server-template pleroma 1 _pleroma._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ social.redxen.eu - -backend backend-homepage - server-template homepage 1 _homepage._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ root.redxen.eu - -backend backend-deavmi-proxy - server-template deavmi-proxy 1 _deavmi-proxy._tcp.redxen.localhost - option httpchk HEAD / HTTP/1.1\r\nHost:\ deavmi-proxy.redxen.eu diff --git a/software-configs/murmur-redxen-config/.internal.conf.swp b/software-configs/murmur-redxen-config/.internal.conf.swp new file mode 100644 index 0000000000000000000000000000000000000000..9728a7d084b17df396adb0e7f315819590269a72 GIT binary patch literal 12288 zcmeI&%We}f6b4`ivB@HU-~~*wVKcW(bD;~QssgEqbkT|mi3Re^coM4U3VD!`T66k)`Odk zmk$|Bg+0yc{wppm&eat|X1CwZ77UJL_Co4FoR!Aez?QjtEsXTiQs-)HgGwi5r8CdS z?2Xj(?m%fLjTVJp58EUe#y|i93xUez-mt~uZWPv?o%Vfx@9y)(eSCrd1Rwwb2tWV= z5P$##{(Av;)?go~${X`aTl2QD($2r4fdB*`009U<00Izz00bZa0SG`~3k3wd;D1Yp z{%`fcpWgppp8tQ{X6y&WcZx3*?XqSI$+BXfB*y_ z009U<00Izz00g#4pjniuD7;KKvCG@jYMK<%H)Z9N9xI)f{-3{8`?Fz_(mJ2_Lw<0` zkB?4x$a{Ry8^nAVg;CUteVvRWFH2*8BHe|SW_@;>H9P!Rnsb#(%bILCzc9*HelChr zsjZVruP?xd{he^OgZ;z3(PKXBhEY6-{M_m~b+q%(+)LFKf)eP;=tP?F2AQr`PNmG!W0Pi= F{RV=8=raHS literal 0 HcmV?d00001 diff --git a/software-configs/murmur-redxen-config/.redxen-dns.conf.swp b/software-configs/murmur-redxen-config/.redxen-dns.conf.swp new file mode 100644 index 0000000000000000000000000000000000000000..9e98a854a93bf731e064c430a7d795cb585fc2cb GIT binary patch literal 12288 zcmeI2%WvaE9LHxlQNi-Oav0LX9-=xP$8j820i48nG^~ zO~OpPPy&>||A0U=e*(THdA_yH^^B%%V*@9zMxPt+woJ4A`^&l3N% zQ38|zB|r&K0+awH@b4$EvkS{{82K&?49ySp5CFJsj;~>7Psb6K;4>Fn4s)ver1xxN z&0PG>$QUsLMS*8o*l5Atpa)ZD#Y(fGqJ20mhEvStgneiigAnh-c~NaNN{yM^DoyOg z)V6AcC0mj^N>!HIWw|5D$@B80Nv;)nDIQ_FBsWGYS9TZc*p8Q@UV&@mCZQ?@p_I+`tEuvv7W`rD$nl-* z$w|}WMPIiL8Y|xKmi5kbZPj`kdsH)pj@mfL4VKl#Oc2tYvwYiL_XIcgn$xOX$n#h` zDJS5F^~mR0%raNM1(gc;hbvUN8fK;$p&!Z+kJB;hvIvDi&_GmM9hoUm|)78}|+*B0(tncm!+9-ao9oS1#w@WRYn+UoqXw7-4z%wYzGKeMr0<(ECBuE@)k;I## zq_LVL>Y^@52<~CWNu1nFKXsQEbpR0yMZ_YM%QD`0g7$PR%S?@E;~Bvn2+l0cAY17M;S>(6FlJ2b*oH?SS>81ZSG%a(l2rwY9E-Af#F(L%I7R&3UazlU z${~A`@#4T68^Pp0+mB4Bie1aGaBy`r+|1`OF<#{*lLoI=1mz_@D;Q)&2)r9yrHNQ3yDb%MN;c1}3b|He96)zfUfY~07)Cg +# Maintainer: Alex Denes +pkgname=murmur-redxen-config +pkgver=1 +pkgrel=0 +pkgdesc="Murmur configurations and related." +url="https://git.redxen.eu/RedXen" +arch="noarch" +license="none" +depends="murmur" +options="!check" # Murmur doesn't offer a way to check configs +source=" + murmur.ini +" + +package() { + install -Dm644 murmur.ini "$pkgdir"/etc/murmur/murmur.ini +} + + +sha512sums="5f1e47f7c0a9235c73b9e45a93e51218bc5a6c44bc26a04db784df0b42881000e6103245c112b96ac5ee2fc03f0864b51fed54c671b102c7a2e47746be369a5d murmur.ini" diff --git a/software-configs/unbound-redxen-config/APKBUILD b/software-configs/unbound-redxen-config/APKBUILD index a5ce0cf..20284da 100644 --- a/software-configs/unbound-redxen-config/APKBUILD +++ b/software-configs/unbound-redxen-config/APKBUILD @@ -28,6 +28,6 @@ package() { sha512sums="0741bc9c6e94a656f35ae452288f0212a2a2df9eda3688a2d3f04012d686adee5f03e3e9f4c72685626f672baaacbd00be71ee0d8699989f47abfd34b72b2b3d main.conf -1c10935777559c174fc36a966e224e5e0ed23f197c209ce40e15312d28e1650293a487017f765da9ea5979ae8720af6af34aa4c6edbb4d0db1c3b00c1bcd7954 base.conf -8b46eaad1ff1cde6d97ef12549b34da0d58f44ec08a9f47965e006f56e80c6a045a88b30ffd9c0f2b8051dd298861dc717bd98fe4c509d136fc9e1580c359713 internal.conf +598ad87d4dfed44d9711fb8164610306907454a3aea3333dc16a098839d9217e86d65075d9a4c3b0ca03d283059d05e99cbd7e9fba9a61b706f99ed356fffb08 base.conf +528cfdbd0b38a77179e1aaf13df606ec5172a4e9273c97566709a8b7a3c08464085009a97013dd1e3d721b35d93a2d4a8f73d51cbc795b610a2e878313b324a5 internal.conf dc2ea0e9e1d4552927ea78f8cb2754284f3d9ce1c2390b3030e08ed6dfc63162764665579726fef8a27a52f12a89181a5008ccdb0b2f39886e11b2c898e0fc12 redxen-dns.conf" diff --git a/software-configs/unbound-redxen-config/base.conf b/software-configs/unbound-redxen-config/base.conf index 562bc52..d69ce1f 100644 --- a/software-configs/unbound-redxen-config/base.conf +++ b/software-configs/unbound-redxen-config/base.conf @@ -15,7 +15,8 @@ server: port: 53 prefetch: yes prefetch-key: yes - do-daemonize: no + do-daemonize: yes + pidfile: "/run/unbound.pid" minimal-responses: no logfile: "" cache-min-ttl: 60 diff --git a/software-configs/unbound-redxen-config/internal.conf b/software-configs/unbound-redxen-config/internal.conf index 4288cce..a7dd506 100644 --- a/software-configs/unbound-redxen-config/internal.conf +++ b/software-configs/unbound-redxen-config/internal.conf @@ -1,2 +1,13 @@ server: local-zone: "redxen.localhost." static + + # Machines + local-data: "8101153.nbg1-dc3.hetzner.redxen.localhost. 86400 IN A " + local-data: "8201371.fsn1-dc14.hetzner.redxen.localhost. 86400 IN A " + + # Familiar names + local-data: "lain.nurnberg.redxen.localhost. 86400 IN CNAME 8101153.nbg1-dc3.hetzner.redxen.localhost." + local-data: "arisu.falkenstein.redxen.localhost. 86400 IN CNAME 8201371.fsn1-dc14.hetzner.redxen.localhost." + + # Services + local-data: "mumble.routinginfo.redxen.localhost. 60 IN SRV 0 5 7573 8101153.nbg1-dc3.hetzner.redxen.localhost." diff --git a/software-configs/varnish-redxen-config/APKBUILD b/software-configs/varnish-redxen-config/APKBUILD index 23d4fcc..dc59159 100644 --- a/software-configs/varnish-redxen-config/APKBUILD +++ b/software-configs/varnish-redxen-config/APKBUILD @@ -16,4 +16,4 @@ package() { } -sha512sums="9347cd8ba1f420397661aa5388cd29ee9ab8a5c170355b49dbff8878234c6c160ef5229a57eaaaeae880b4ddb7b0f17da557e53c082fbabb09c0e2048e0be045 main.vcl" +sha512sums="6674a942017c0f1be2ff6eefb9f2a92a0f7d615e4ce367e880bceef0ec2646f3aac4180f2bb32557ac9ae8590b02882d05afbc7478bee9069a8138945e6835fc main.vcl" diff --git a/software-configs/varnish-redxen-config/main.vcl b/software-configs/varnish-redxen-config/main.vcl index ca1c9b7..44b860e 100644 --- a/software-configs/varnish-redxen-config/main.vcl +++ b/software-configs/varnish-redxen-config/main.vcl @@ -2,8 +2,8 @@ vcl 4.1; import std; backend default { - .host = "haproxy.routinginfo.redxen.localhost"; - .port = "7202"; + .host = "127.0.0.1"; + .port = "7500"; .max_connections = 300; .first_byte_timeout = 240s; .connect_timeout = 10s;