pool/rrdtool
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202361 from devel:languages:python

Browse Source 
Can someone look at changes ? I think it's good but I'm not sure... (forwarded request 202178 from posophe)

OBS-URL: https://build.opensuse.org/request/show/202361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=51
This commit is contained in:
Tomáš Chvátal 2013-10-06 12:32:41 +00:00 committed by Git OBS Bridge
commit 3c3e3b95b1
5 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rrdcached-systemd-pre
View File

@ -14,7 +14,7 @@ test -r $RRDCACHED_CONFIG || { echo "$RRDCACHED_CONFIG not existing";
if [ "$1" = "stop" ]; then exit 0; if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; } else exit 6; fi; }
RRDCACHED_PID='/var/lib/rrdtool/rrdcached/rrdcached.pid' RRDCACHED_PID='/run/rrdcached.pid'
# Read config # Read config
. $RRDCACHED_CONFIG . $RRDCACHED_CONFIG

3
rrdcached.service
View File

@ -12,13 +12,14 @@ 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
ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p "$RRDCACHED_PID" -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w $RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS $RRDCACHED_OPTIONS ExecStart=/usr/bin/rrdcached -s $RRDCACHED_GROUP -b "$RRDCACHED_CHROOT_DIR" -p "$RRDCACHED_PID" -l $RRDCACHED_ADDRESS -m $RRDCACHED_SOCKET_MASK -w $RRDCACHED_DISKWRITE -z $RRDCACHED_DELAY -t $RRDCACHED_WRITE_THREADS $RRDCACHED_OPTIONS
Restart=always Restart=always
RestartSec=1 RestartSec=1
PIDFile="$RRDCACHED_PID" PIDFile=/run/rrdcached.pid
TimeoutStopSec=10 TimeoutStopSec=10
[Install] [Install]

12
rrdtool.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Oct 4 17:01:23 UTC 2013 - p.drouand@gmail.com
- Remove PIDfile definition of sysconfig file and add it in systemd
service file
- Fix PIDfile location to /run instead of var/lib/rccached
-------------------------------------------------------------------
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

1
sysconfig.rrdcached
View File

@ -102,3 +102,4 @@ RRDCACHED_CHROOT_DIR="/tmp"
# Other options - see man 1 rrdcached # Other options - see man 1 rrdcached
# #
RRDCACHED_OPTIONS="" RRDCACHED_OPTIONS=""