rpm/rrdtool
SHA256
1
0
Fork 0
forked from pool/rrdtool
Code Pull Requests Activity

Accepting request 202136 from home:jsjhb:branches:devel:languages:python

Browse Source 
fix systemd service file for rrdcached, add pid file variable to sysconfig file

OBS-URL: https://build.opensuse.org/request/show/202136
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=46
This commit is contained in:
Denisart Benjamin 2013-10-04 12:07:36 +00:00 committed by Git OBS Bridge
parent c2cf875cf9
commit 47bcbb3469
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rrdcached.service
View File

@ -12,6 +12,7 @@ Wants=network.target
After=network.target After=network.target
[Service] [Service]
Type=forking
ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools - rrdcached)' ExecStartPre=-/bin/echo 'Starting RRD data caching service (rrdtools - rrdcached)'
ExecStartPre=/bin/sh -c "/usr/share/rrdcached/rrdcached-systemd-pre" ExecStartPre=/bin/sh -c "/usr/share/rrdcached/rrdcached-systemd-pre"
EnvironmentFile=-/etc/sysconfig/rrdcached EnvironmentFile=-/etc/sysconfig/rrdcached

5
rrdtool.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 4 10:40:05 UTC 2013 - obs@botter.cc
- fix rrdcached service file (type=forking), add pid file variable
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 3 14:41:37 UTC 2013 - p.drouand@gmail.com Thu Oct 3 14:41:37 UTC 2013 - p.drouand@gmail.com

15
rrdtool.spec
View File

@ -17,25 +17,25 @@
Name: rrdtool Name: rrdtool
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: gettext-tools
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: groff BuildRequires: groff
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libart_lgpl-devel BuildRequires: libart_lgpl-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: lua51-devel
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: tcl-devel
BuildRequires: gettext-tools
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: lua51-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: tcpd-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: tcl-devel
BuildRequires: tcpd-devel
Requires: perl = %{perl_version} Requires: perl = %{perl_version}
Version: 1.4.7 Version: 1.4.7
Release: 0 Release: 0
@ -241,7 +241,6 @@ install -Dm755 %{SOURCE4} %{buildroot}%{_datadir}/rrdcached/rrdcached-systemd-pr
install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service install -Dm644 %{SOURCE5} %{buildroot}%{_unitdir}/rrdcached.service
mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached mkdir -p %{buildroot}%{_localstatedir}/lib/rrdtool/rrdcached
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig

10
sysconfig.rrdcached
View File

@ -102,3 +102,13 @@ RRDCACHED_CHROOT_DIR="/tmp"
# Other options - see man 1 rrdcached # Other options - see man 1 rrdcached
# #
RRDCACHED_OPTIONS="" RRDCACHED_OPTIONS=""
## Type: string
## Default: "/var/lib/rrdtool/rrdcached/rrdcached.pid"
## Config: rrdcached
## ServiceRestart: rrdcached
#
# PID file location
#
RRDCACHED_PID="/var/lib/rrdtool/rrdcached/rrdcached.pid"