diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-24 21:41:29 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-04-24 21:43:29 +0200 |
| commit | 89d744ee047224cd9e231b0817e085437fe82d84 (patch) | |
| tree | 4474390b04e5f87edc0ceb534f18d59ca6830d92 /main | |
| parent | 146fb0d67a1b861d5c776d97f533efe0bb26af7a (diff) | |
| download | aports-89d744ee047224cd9e231b0817e085437fe82d84.tar.bz2 aports-89d744ee047224cd9e231b0817e085437fe82d84.tar.xz | |
main/rsync: improve runscript, let OpenRC daemonize the daemon
Diffstat (limited to 'main')
| -rw-r--r-- | main/rsync/APKBUILD | 19 | ||||
| -rw-r--r-- | main/rsync/rsyncd.conf | 9 | ||||
| -rw-r--r-- | main/rsync/rsyncd.confd | 11 | ||||
| -rw-r--r-- | main/rsync/rsyncd.initd | 10 |
4 files changed, 21 insertions, 28 deletions
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD index 036465b8cc..50ed005230 100644 --- a/main/rsync/APKBUILD +++ b/main/rsync/APKBUILD @@ -1,12 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=rsync pkgver=3.1.2 -pkgrel=4 +pkgrel=5 pkgdesc="A file transfer program to keep remote files in sync" url="https://rsync.samba.org/" arch="all" license="GPL3" -depends= makedepends="perl acl-dev popt-dev" subpackages="$pkgname-doc" source="https://download.samba.org/pub/$pkgname/$pkgname-$pkgver.tar.gz @@ -42,18 +41,8 @@ package() { install -D -m 644 "$srcdir"/rsyncd.logrotate "$pkgdir"/etc/logrotate.d/rsyncd } -md5sums="0f758d7e000c0f7f7d3792610fad70cb rsync-3.1.2.tar.gz -ae83a834732f301c1f3561e97b0f47b4 rsyncd.initd -e5e62e8cef29e09c22e8ba8152ec1751 rsyncd.confd -a99211a14af1766ba849035241cd5bb2 rsyncd.conf -169cafc6907a4c3787bb0462e9d6a5c2 rsyncd.logrotate" -sha256sums="ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 rsync-3.1.2.tar.gz -a05b776cd5b94794621f388069dfc0bd85ecd3f610b6876648cb988648852401 rsyncd.initd -de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 rsyncd.confd -2c00ca760c26bd7d6e1d8306d48eb9b27d876516c354f6d37c458871d5ac012f rsyncd.conf -eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea899c6a8f8f980c7c rsyncd.logrotate" sha512sums="4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b rsync-3.1.2.tar.gz -167bae4200203867c93155212cf3856fe9d6387d9171e27c3ecc1813afa330a14efc2b905440f71bb94dbbb4d96c2a3c7a871ec37111899cf25a47807cc45f0d rsyncd.initd -8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 rsyncd.confd -5bcd339bac70d7c2efc2a028852efb9a4a78d8b7b114979763d29d0b378afceb753954c31cca5dfb05dadd88479e5c875626e297ba31a57ee3da5ecad29dbd6d rsyncd.conf +638d87c9a753b35044f6321ccd09d2c0addaab3c52c40863eb6905905576b5268bec67b496df81225528c9e39fbd92e9225d7b3037ab1fda78508d452c78158f rsyncd.initd +c7527e289c81bee5e4c14b890817cdb47d14f0d26dd8dcdcbe85c7199cf27c57a0b679bdd1b115bfe00de77b52709cc5d97522a47f63c1bb5104f4a7220c9961 rsyncd.confd +3db8a2b364fc89132af6143af90513deb6be3a78c8180d47c969e33cb5edde9db88aad27758a6911f93781e3c9846aeadc80fffc761c355d6a28358853156b62 rsyncd.conf b8d6c0bb467a5c963317dc55478d2c10874564cd264d943d4a42037e2fce134fe001fabc92af5c6b5775e84dc310b1c8da147afaa61c99e5663c36580d8651a5 rsyncd.logrotate" diff --git a/main/rsync/rsyncd.conf b/main/rsync/rsyncd.conf index b6dd5994d4..6318016e99 100644 --- a/main/rsync/rsyncd.conf +++ b/main/rsync/rsyncd.conf @@ -1,10 +1,7 @@ # /etc/rsyncd.conf +# Minimal configuration file for rsync daemon. +# See rsync(1) and rsyncd.conf(5) man pages for help. +# Do not set "pid file" here. -# Minimal configuration file for rsync daemon -# See rsync(1) and rsyncd.conf(5) man pages for help - -# This line is required by the /etc/init.d/rsyncd script -pid file = /var/run/rsyncd.pid use chroot = yes read only = yes - diff --git a/main/rsync/rsyncd.confd b/main/rsync/rsyncd.confd index c3d897ed2f..7128f97fde 100644 --- a/main/rsync/rsyncd.confd +++ b/main/rsync/rsyncd.confd @@ -1,5 +1,8 @@ -# /etc/conf.d/rsyncd: config file for /etc/init.d/rsyncd +# Config file for /etc/init.d/rsyncd -# see man pages for rsync or run `rsync --help` -# for valid cmdline options -#RSYNC_OPTS="" +# Path to configuration file. +#cfgfile="/etc/rsyncd.conf" + +# See man pages for rsync or run `rsync --daemon --help` +# for valid cmdline options. +#command_args="" diff --git a/main/rsync/rsyncd.initd b/main/rsync/rsyncd.initd index 8115d250b3..eb05b3b59e 100644 --- a/main/rsync/rsyncd.initd +++ b/main/rsync/rsyncd.initd @@ -1,9 +1,13 @@ #!/sbin/openrc-run -cfgfile="/etc/rsyncd.conf" -pidfile="$(grep "^pid file" $cfgfile | cut -d= -f2)" +: ${cfgfile:="/etc/rsyncd.conf"} + command="/usr/bin/rsync" -command_args="--daemon $command_args $RSYNC_OPTS" +command_args="--daemon --no-detach --config=$cfgfile + $command_args $RSYNC_OPTS" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" required_files="$cfgfile" depend() { |