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

Accepting request 615438 from server:monitoring

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/615438
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/collectd?expand=0&rev=29
This commit is contained in:
Yuchen Lin 2018-06-13 13:38:50 +00:00 committed by Git OBS Bridge
commit 83f9217215
4 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
collectd-js.apache2.conf
View File

@ -3,29 +3,33 @@
# Access control:
<Directory "/srv/www/collectd-js">
Order allow,deny
# You might want to change this to avoid giving everyone
# access to the collectd statistics, e.g.:
# Allow from all
# Allow from localhost
# Allow from 192.168.
Deny from all
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
</Directory>
<Directory "/srv/www/collectd-js/bin">
Options +ExecCGI
AddHandler cgi-script .cgi
Order allow,deny
# You might want to change this to give access from
# different hosts to the collectd statistics, e.g.:
#
# Allow from all
# Allow from 192.168.
Allow from localhost
Deny from all
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
</Directory>
</IfModule>

20
collectd.apache2.conf
View File

@ -3,15 +3,17 @@
# Access control:
<Directory "/srv/www/collectd">
Order allow,deny
# You might want to change this to give access from
# different hosts to the collectd statistics, e.g.:
#
# Allow from all
# Allow from 192.168.
Allow from localhost
Deny from all
<IfModule mod_authz_core.c>
# Apache 2.4
<RequireAll>
Require all granted
</RequireAll>
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
</Directory>
</IfModule>

6
collectd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 7 12:24:38 UTC 2018 - mardnh@gmx.de
- Fix BuildRequires for collectd-web
- Make apache configuration files compatible with Apache v2.2 and v2.4
-------------------------------------------------------------------
Wed Dec 13 15:50:24 UTC 2017 - stefan.bruens@rwth-aachen.de

5
collectd.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package collectd
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2005-2013 Pascal Bleser <pascal.bleser@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@ -45,7 +45,7 @@ Name: collectd
Version: 5.7.2
Release: 0
Summary: Statistics Collection Daemon for filling RRD Files
License: GPL-2.0
License: GPL-2.0-only
Group: System/Monitoring
Url: http://collectd.org/
Source: http://collectd.org/files/collectd-%{version}.tar.bz2
@ -156,6 +156,7 @@ Requires: rrdtool
Requires: perl(CGI)
Requires: perl(Data::Dumper)
Requires: perl(HTML::Entities)
Requires: perl(RRDs)
Requires: perl(URI::Escape)
%description web