From 331c94f473a8edf688c8ecffb55e2ef4cd266490 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Tue, 19 Apr 2022 13:00:25 +0000 Subject: [PATCH] Add seedbox cifs mount --- .gitignore | 3 ++- openrc/seedbox-mount/APKBUILD | 13 +++++++++++++ openrc/seedbox-mount/conffile | 3 +++ openrc/seedbox-mount/runfile | 22 ++++++++++++++++++++++ openrc/transmission/APKBUILD | 6 +++--- openrc/transmission/runfile | 5 ++--- secret/seedbox-mount/APKBUILD | 11 +++++++++++ 7 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 openrc/seedbox-mount/APKBUILD create mode 100644 openrc/seedbox-mount/conffile create mode 100644 openrc/seedbox-mount/runfile create mode 100644 secret/seedbox-mount/APKBUILD diff --git a/.gitignore b/.gitignore index f277a4f..2eb560e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ pkg/ secret/alpinepkg-httpauth/secret secret/radicale-httpauth/secret -openrc/vtun/secret +secret/seedbox-mount/secret secret/letsencrypt/private.key +openrc/vtun/secret config/telegraf/secret config/grafana/secret diff --git a/openrc/seedbox-mount/APKBUILD b/openrc/seedbox-mount/APKBUILD new file mode 100644 index 0000000..c2fc400 --- /dev/null +++ b/openrc/seedbox-mount/APKBUILD @@ -0,0 +1,13 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-openrc.template + +pkgver=2022.04.19.10 +pkgrel=0 +depends="redxen-secret-seedbox-mount cifs-utils" + +sha512sums=" +d9661deeef39cb84c347f80ad78e8f455d201d1375d6c3ac7064321edb7d619d685dce71993b8644fe91c0a8f2f29c52c2a79b8a91360d08a230f27369a54ecb runfile +b0de4ab3bb8b039b6609a92f2fe8bb42f4bdad0d777e4281f34becd6269e5a8cb99a5c15cb5fc0b5e86ff04ddfeff2032311452aa986debc2def0e146cf7d050 conffile +" diff --git a/openrc/seedbox-mount/conffile b/openrc/seedbox-mount/conffile new file mode 100644 index 0000000..039c07f --- /dev/null +++ b/openrc/seedbox-mount/conffile @@ -0,0 +1,3 @@ +mountpath="/seedbox" +endpoint="//u299888-sub1.your-storagebox.de/u299888-sub1" +creds="/etc/redxen/seedbox-mount/secret" diff --git a/openrc/seedbox-mount/runfile b/openrc/seedbox-mount/runfile new file mode 100644 index 0000000..14eb6ea --- /dev/null +++ b/openrc/seedbox-mount/runfile @@ -0,0 +1,22 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +depend() { + use net + need localmount +} + +start_pre() { + checkpath -d -m 744 -o transmission:transmission "$mountpath" + checkpath -d -m 744 -o root:root /sftp-chroot/"$mountpath" +} + +start() { + mount -t cifs -o credentials="$creds",rw,cache=none,seal,uid="$(id -u transmission)",gid="$(id -g transmission)",dir_mode=0755,file_mode=0644 "$endpoint" "$mountpath" || stop + mount --bind "${mountpath}" /sftp-chroot"${mountpath}" || stop +} + +stop() { + umount /sftp-chroot"$mountpath" || true + umount "$mountpath" || true +} diff --git a/openrc/transmission/APKBUILD b/openrc/transmission/APKBUILD index bf7bfee..3fad7d9 100644 --- a/openrc/transmission/APKBUILD +++ b/openrc/transmission/APKBUILD @@ -3,11 +3,11 @@ . ../APKBUILD-openrc.template -pkgver=2021.06.06.01 +pkgver=2022.04.19.01 pkgrel=5 -depends="openrc transmission-daemon redxen-config-$_rx_pkgname" +depends="openrc transmission-daemon redxen-config-$_rx_pkgname redxen-openrc-seedbox-mount" sha512sums=" -33b7455f8c5dd447bba922baec758014951c98f7d0566092c4e71cac34e1dea3777cbde75d6d17145a78c320ac4165de395f2b33e59093eb849433d09bf2367c runfile +57e860c205ae7d08bd4d955887705d0727df755e2b7c4ece737cce8878e45d94c2c060cb14f01c0bd38db938bf0d62397ba76f313a3ce1b50dd60946156d99fa runfile 1093691d509aa49100e944f2308702bd9475da36f1dfe536dd5cc5bb67fcc123d927c3a6810812fa4ada40f9b445dc114b22db3e6799319b4ad9f0bdfbf67278 conffile " diff --git a/openrc/transmission/runfile b/openrc/transmission/runfile index bef9994..2d1f0f9 100644 --- a/openrc/transmission/runfile +++ b/openrc/transmission/runfile @@ -19,8 +19,8 @@ pidfile="${pidfile:-${rundir}/transmission.pid}" command_args="--pid-file ${pidfile}" depend() { - need net - after firewall + need net redxen.seedbox-mount + after firewall redxen.seedbox-mount } check_config() { @@ -42,4 +42,3 @@ reload() { start-stop-daemon --signal HUP --pidfile ${pidfile} eend $? } - diff --git a/secret/seedbox-mount/APKBUILD b/secret/seedbox-mount/APKBUILD new file mode 100644 index 0000000..e47e9d9 --- /dev/null +++ b/secret/seedbox-mount/APKBUILD @@ -0,0 +1,11 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes + +. ../APKBUILD-secret.template + +pkgver=2022.04.17.01 +pkgrel=0 +source="secret" +sha512sums=" +24d41c3cc0bcd09f90f3e748ac5bc2bd8844ed27ab22faa8cffc1ce1fa3cfdb2727b80a2b2f22ee91a9470de5c2c99db6873bbb7294903a6133ece13ab429b6a secret +"