diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2019-01-27 00:41:20 +0100 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-01-28 01:51:37 +0100 |
commit | c24314f73b7bb44a6d16b359ecb62050703c917d (patch) | |
tree | 5a1dcd53ab556dbcfc566570d5eb01ba0d2d2d4b | |
parent | e5d012de60e3e83dd28cd5e592ad3282a55031fe (diff) | |
download | alpine_aports-c24314f73b7bb44a6d16b359ecb62050703c917d.tar.bz2 alpine_aports-c24314f73b7bb44a6d16b359ecb62050703c917d.tar.xz alpine_aports-c24314f73b7bb44a6d16b359ecb62050703c917d.zip |
main/rsyslog: modernize init script
-rw-r--r-- | main/rsyslog/APKBUILD | 5 | ||||
-rw-r--r-- | main/rsyslog/rsyslog.confd | 17 | ||||
-rw-r--r-- | main/rsyslog/rsyslog.initd | 43 |
3 files changed, 16 insertions, 49 deletions
diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD index 636ed0b118..01b9dab09c 100644 --- a/main/rsyslog/APKBUILD +++ b/main/rsyslog/APKBUILD | |||
@@ -32,7 +32,6 @@ install="$pkgname.post-upgrade" | |||
32 | subpackages="$pkgname-doc $pkgname-dbg" | 32 | subpackages="$pkgname-doc $pkgname-dbg" |
33 | source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz | 33 | source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz |
34 | $pkgname.initd | 34 | $pkgname.initd |
35 | $pkgname.confd | ||
36 | $pkgname.logrotate | 35 | $pkgname.logrotate |
37 | $pkgname.conf | 36 | $pkgname.conf |
38 | musl-fix.patch | 37 | musl-fix.patch |
@@ -94,7 +93,6 @@ package() { | |||
94 | rm -f "$pkgdir"/usr/lib/rsyslog/imdiag.so | 93 | rm -f "$pkgdir"/usr/lib/rsyslog/imdiag.so |
95 | 94 | ||
96 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname | 95 | install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname |
97 | install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname | ||
98 | install -m644 -D "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname | 96 | install -m644 -D "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname |
99 | install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf | 97 | install -m644 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf |
100 | } | 98 | } |
@@ -120,8 +118,7 @@ _plugin() { | |||
120 | } | 118 | } |
121 | 119 | ||
122 | sha512sums="3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd rsyslog-8.40.0.tar.gz | 120 | sha512sums="3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd rsyslog-8.40.0.tar.gz |
123 | 9a4b184076a82e0899da79ab3749e1c67eac03f36c4460d34ed0385f4a3ffad53681a1cc25dd514e835c9399a9abd01c235743535ad549d5be7f66d9e127b9dc rsyslog.initd | 121 | bcd63c8df2ac63b80f3cb51ba7f544988df6cd875f4e81020e762dff30d7537f21b72c95a4b1c08baf15f4ed5f03defbf3f061673aabada5841f45ab9f579374 rsyslog.initd |
124 | a4d969671800227129be870b0318961b79d16365663754111a136734bbf7005abd4da24853dfdc07b3b6691ab5a7b215f0ac6c19022b4c5c8dab06165a42431b rsyslog.confd | ||
125 | d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate | 122 | d54377ddf39197656811a84272568ea761f984e19dd04fc54f372dd04a9244e66d02b26ab33073d0344d054f031660ec611f3c7a18c266e7b68cef5e2c47f06f rsyslog.logrotate |
126 | 3bcd58b222eb7f4d8a42a0643cacb6ab44790f90c9bd550678e002bc19863d5d6a7341e5e5ba0b9292f85c6c04cd5cc42d174acdc63e8ba22022620db10f2b9b rsyslog.conf | 123 | 3bcd58b222eb7f4d8a42a0643cacb6ab44790f90c9bd550678e002bc19863d5d6a7341e5e5ba0b9292f85c6c04cd5cc42d174acdc63e8ba22022620db10f2b9b rsyslog.conf |
127 | 04f1c8060b9439fe25f9a4291697c577fb3d540aefcd67ed6d63d416c1dd0306fa68ae89745af2b4dc2e288d46aadd9c7a96ccfaaf3a146d9d76bd3433e3c1a5 musl-fix.patch | 124 | 04f1c8060b9439fe25f9a4291697c577fb3d540aefcd67ed6d63d416c1dd0306fa68ae89745af2b4dc2e288d46aadd9c7a96ccfaaf3a146d9d76bd3433e3c1a5 musl-fix.patch |
diff --git a/main/rsyslog/rsyslog.confd b/main/rsyslog/rsyslog.confd deleted file mode 100644 index c3ad774742..0000000000 --- a/main/rsyslog/rsyslog.confd +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | # Copyright 1999-2010 Gentoo Foundation | ||
2 | # Distributed under the terms of the GNU General Public License v2 | ||
3 | # $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.confd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $ | ||
4 | |||
5 | # Configuration file | ||
6 | CONFIGFILE="/etc/rsyslog.conf" | ||
7 | |||
8 | # PID file | ||
9 | PIDFILE="/var/run/rsyslogd.pid" | ||
10 | |||
11 | # Options to rsyslogd | ||
12 | # See rsyslogd(8) for more details | ||
13 | # Notes: | ||
14 | # * Do not specify another PIDFILE but use the variable above to change the location | ||
15 | # * Do not specify another CONFIGFILE but use the variable above to change the location | ||
16 | # * "-c5" tells rsyslog to _not_ run in sysklogd compatibility mode | ||
17 | RSYSLOG_OPTS="" | ||
diff --git a/main/rsyslog/rsyslog.initd b/main/rsyslog/rsyslog.initd index 682f1e2652..f870ba3b2b 100644 --- a/main/rsyslog/rsyslog.initd +++ b/main/rsyslog/rsyslog.initd | |||
@@ -1,39 +1,26 @@ | |||
1 | #!/sbin/openrc-run | 1 | #!/sbin/openrc-run |
2 | # Copyright 1999-2010 Gentoo Foundation | ||
3 | # Distributed under the terms of the GNU General Public License v2 | ||
4 | # $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/files/5-stable/rsyslog.initd,v 1.1 2010/10/21 07:38:29 dev-zero Exp $ | ||
5 | 2 | ||
6 | extra_started_commands="reload" | 3 | extra_started_commands="reload" |
7 | 4 | ||
8 | depend() { | 5 | description_reload="Reload the configuration and re-open log files" |
9 | need clock hostname localmount | ||
10 | provide logger | ||
11 | } | ||
12 | 6 | ||
13 | start() { | 7 | : ${cfgfile:=${CONFIGFILE:="/etc/rsyslog.conf"}} |
14 | ebegin "Starting rsyslogd" | ||
15 | start-stop-daemon \ | ||
16 | --start --quiet --exec /usr/sbin/rsyslogd \ | ||
17 | -- ${RSYSLOG_OPTS} -i "${PIDFILE}" -f "${CONFIGFILE}" | ||
18 | eend $? | ||
19 | } | ||
20 | 8 | ||
21 | stop() { | 9 | pidfile="/run/$RC_SVCNAME.pid" |
22 | ebegin "Stopping rsyslogd" | 10 | command="/usr/sbin/rsyslogd" |
23 | start-stop-daemon \ | 11 | command_args="-i $pidfile -f $cfgfile ${command_args:-$RSYSLOG_OPTS}" |
24 | --stop --quiet \ | 12 | |
25 | --pidfile "${PIDFILE}" | 13 | required_files="$cfgfile" |
26 | eend $? | 14 | |
15 | depend() { | ||
16 | need hostname localmount | ||
17 | use clock | ||
18 | before net | ||
19 | provide logger | ||
27 | } | 20 | } |
28 | 21 | ||
29 | reload() { | 22 | reload() { |
30 | if [ ! -f "${PIDFILE}" ]; then | 23 | ebegin "Reloading configuration and re-opening log files" |
31 | eerror "rsyslogd not running" | 24 | start-stop-daemon --signal HUP --pidfile "$pidfile" |
32 | return 1 | ||
33 | fi | ||
34 | |||
35 | ebegin "Re-opening rsyslogd log files" | ||
36 | start-stop-daemon --stop --signal HUP \ | ||
37 | --pidfile "${PIDFILE}" | ||
38 | eend $? | 25 | eend $? |
39 | } | 26 | } |