Merge "New pluginsdir: /usr/lib/shinken/plugins"

This commit is contained in:
Jenkins 2015-01-26 19:41:12 +00:00 committed by Gerrit Code Review
commit 6dbc42988c
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ RUN chmod u+s /bin/ping6
ADD shinken-tools/packs /packs
## Plugins
ADD shinken-tools/plugins/*/check_* /usr/lib/nagios/plugins/
ADD shinken-tools/plugins/*/check_* /usr/lib/shinken/plugins/
# Download packs from savoirfairelinux/monitoring-tools
RUN apt-get install -y subversion && \

View File

@ -3,5 +3,5 @@ $USER1$=$NAGIOSPLUGINSDIR$
$NAGIOSPLUGINSDIR$=/usr/lib/nagios/plugins
#-- Location of the plugins for Shinken
$PLUGINSDIR$=/var/lib/shinken/libexec
$PLUGINSDIR$=/usr/lib/shinken/plugins