[Nagios-checkins] SF.net SVN: nagios:[2068] nagioscore/trunk

ageric at users.sourceforge.net ageric at users.sourceforge.net
Fri Aug 17 12:03:29 UTC 2012


Revision: 2068
          http://nagios.svn.sourceforge.net/nagios/?rev=2068&view=rev
Author:   ageric
Date:     2012-08-17 12:03:29 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
Expunge embedded perl from all kinds of configuration files

The sample config shouldn't mention it anymore since it's obsoleted.
Same goes for test-configurations.

Original-patch-by: Daniel Wittenberg <dwittenberg2008 at gmail.com>
Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/sample-config/nagios.cfg.in
    nagioscore/trunk/t/etc/nagios-empty-groups.cfg
    nagioscore/trunk/t/etc/nagios-hosturgencies.cfg
    nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg
    nagioscore/trunk/t/etc/nagios-no-service.cfg
    nagioscore/trunk/t/etc/nagios-no-status.cfg
    nagioscore/trunk/t/etc/nagios-with-generated-status.cfg
    nagioscore/trunk/t/etc/nagios.cfg
    nagioscore/trunk/t-tap/smallconfig/nagios.cfg

Modified: nagioscore/trunk/sample-config/nagios.cfg.in
===================================================================
--- nagioscore/trunk/sample-config/nagios.cfg.in	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/sample-config/nagios.cfg.in	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1099,37 +1099,6 @@
 
 
 
-
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=@bindir@/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-empty-groups.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-empty-groups.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-empty-groups.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1057,37 +1057,6 @@
 
 
 
-
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-hosturgencies.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-hosturgencies.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-hosturgencies.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-no-service.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-service.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-no-service.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-no-status.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-status.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-no-status.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios-with-generated-status.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-with-generated-status.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios-with-generated-status.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t/etc/nagios.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t/etc/nagios.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

Modified: nagioscore/trunk/t-tap/smallconfig/nagios.cfg
===================================================================
--- nagioscore/trunk/t-tap/smallconfig/nagios.cfg	2012-08-17 12:02:54 UTC (rev 2067)
+++ nagioscore/trunk/t-tap/smallconfig/nagios.cfg	2012-08-17 12:03:29 UTC (rev 2068)
@@ -1058,36 +1058,6 @@
 
 
 
-# P1.PL FILE LOCATION
-# This value determines where the p1.pl perl script (used by the
-# embedded Perl interpreter) is located.  If you didn't compile
-# Nagios with embedded Perl support, this option has no effect.
-
-p1_file=/usr/local/nagios/bin/p1.pl
-
-
-
-# EMBEDDED PERL INTERPRETER OPTION
-# This option determines whether or not the embedded Perl interpreter
-# will be enabled during runtime.  This option has no effect if Nagios
-# has not been compiled with support for embedded Perl.
-# Values: 0 = disable interpreter, 1 = enable interpreter
-
-enable_embedded_perl=1
-
-
-
-# EMBEDDED PERL USAGE OPTION
-# This option determines whether or not Nagios will process Perl plugins
-# and scripts with the embedded Perl interpreter if the plugins/scripts
-# do not explicitly indicate whether or not it is okay to do so. Read
-# the HTML documentation on the embedded Perl interpreter for more 
-# information on how this option works.
-
-use_embedded_perl_implicitly=1
-
-
-
 # ILLEGAL OBJECT NAME CHARACTERS
 # This option allows you to specify illegal characters that cannot
 # be used in host names, service descriptions, or names of other

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list