[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 9c3d928bf4434cfa55d9af434f3c5924c3fe7778
Author: Naparuba <naparuba at gmail.com>
Date:   Tue Jan 3 11:38:52 2012 +0100

    Add : macros file in the packs.

diff --git a/etc/packs/asterisk/macros.cfg b/etc/packs/asterisk/macros.cfg
new file mode 100644
index 0000000..b0d9c1a
--- /dev/null
+++ b/etc/packs/asterisk/macros.cfg
@@ -0,0 +1,2 @@
+### Asterisk
+$SIPUSER$=user at mydomain.com
\ No newline at end of file
diff --git a/etc/packs/mssql/macros.cfg b/etc/packs/mssql/macros.cfg
new file mode 100644
index 0000000..cfab9bf
--- /dev/null
+++ b/etc/packs/mssql/macros.cfg
@@ -0,0 +1,3 @@
+### MSSQL credentials
+$MSSQLUSER$=someuser
+$MSSQLPASSWORD$=somepassword
diff --git a/etc/packs/mysql/macros.cfg b/etc/packs/mysql/macros.cfg
new file mode 100644
index 0000000..c1078af
--- /dev/null
+++ b/etc/packs/mysql/macros.cfg
@@ -0,0 +1,4 @@
+### Mysql credentials
+$MYSQLUSER$=root
+$MYSQLPASSWORD$=root
+
diff --git a/etc/packs/oracle/macros.cfg b/etc/packs/oracle/macros.cfg
new file mode 100644
index 0000000..6d98d3b
--- /dev/null
+++ b/etc/packs/oracle/macros.cfg
@@ -0,0 +1,5 @@
+### Oracle credentials and methods
+# You can chooose perl DBD:Oracle lib or the sqlplus binary methods
+$ORACLE_CHECK_METHOD$=dbi
+$ORACLEUSER$=nagios
+$ORACLEPASSWORD$=oradbmon
diff --git a/etc/packs/esx/commands.cfg b/etc/packs/vmware/esx/commands.cfg
similarity index 100%
rename from etc/packs/esx/commands.cfg
rename to etc/packs/vmware/esx/commands.cfg
diff --git a/etc/packs/esx/cpu.cfg b/etc/packs/vmware/esx/cpu.cfg
similarity index 100%
rename from etc/packs/esx/cpu.cfg
rename to etc/packs/vmware/esx/cpu.cfg
diff --git a/etc/packs/esx/io.cfg b/etc/packs/vmware/esx/io.cfg
similarity index 100%
rename from etc/packs/esx/io.cfg
rename to etc/packs/vmware/esx/io.cfg
diff --git a/etc/packs/esx/mem.cfg b/etc/packs/vmware/esx/mem.cfg
similarity index 100%
rename from etc/packs/esx/mem.cfg
rename to etc/packs/vmware/esx/mem.cfg
diff --git a/etc/packs/esx/net.cfg b/etc/packs/vmware/esx/net.cfg
similarity index 100%
rename from etc/packs/esx/net.cfg
rename to etc/packs/vmware/esx/net.cfg
diff --git a/etc/packs/vmware/macros.cfg b/etc/packs/vmware/macros.cfg
new file mode 100644
index 0000000..61d88dc
--- /dev/null
+++ b/etc/packs/vmware/macros.cfg
@@ -0,0 +1,4 @@
+#### vSphere (ESX) part
+$VCENTER$=vcenter.mydomain.com
+$VCENTERLOGIN$=someuser
+$VCENTERPASSWORD$=somepassowrd
diff --git a/etc/packs/vm/commands.cfg b/etc/packs/vmware/vm/commands.cfg
similarity index 100%
rename from etc/packs/vm/commands.cfg
rename to etc/packs/vmware/vm/commands.cfg
diff --git a/etc/packs/vm/cpu.cfg b/etc/packs/vmware/vm/cpu.cfg
similarity index 100%
rename from etc/packs/vm/cpu.cfg
rename to etc/packs/vmware/vm/cpu.cfg
diff --git a/etc/packs/vm/io.cfg b/etc/packs/vmware/vm/io.cfg
similarity index 100%
rename from etc/packs/vm/io.cfg
rename to etc/packs/vmware/vm/io.cfg
diff --git a/etc/packs/vm/mem.cfg b/etc/packs/vmware/vm/mem.cfg
similarity index 100%
rename from etc/packs/vm/mem.cfg
rename to etc/packs/vmware/vm/mem.cfg
diff --git a/etc/packs/vm/net.cfg b/etc/packs/vmware/vm/net.cfg
similarity index 100%
rename from etc/packs/vm/net.cfg
rename to etc/packs/vmware/vm/net.cfg
diff --git a/etc/resource.cfg b/etc/resource.cfg
index 71f588f..f0c5c9e 100644
--- a/etc/resource.cfg
+++ b/etc/resource.cfg
@@ -1,3 +1,4 @@
+# Nagios legacy macros
 $USER1$=/usr/local/shinken/libexec
 $USER2$=public
 
@@ -6,41 +7,17 @@ $USER2$=public
 $PLUGINSDIR$=/usr/lib/nagios/plugins
 
 
-##Now Activie directory and Ldap
+##Now Active directory and Ldap macros
 $DOMAINUSER$=shinken_user
 $DOMAINPASSWORD$=superpassword
 $LDAPBASE$=dc=eu,dc=society,dc=com
 
 
-### MSSQL credentials
-$MSSQLUSER$=someuser
-$MSSQLPASSWORD$=somepassowrd
-
-
-### Mysql credentials
-$MYSQLUSER$=root
-$MYSQLPASSWORD$=root
-
-
-### Oracle credentials and methods
-# You can chooose perl DBD:Oracle lib or the sqlplus binary methods
-$ORACLE_CHECK_METHOD$=dbi
-$ORACLEUSER$=nagios
-$ORACLEPASSWORD$=oradbmon
-
-
-#### vSphere (ESX) part
-$VCENTER$=vcenter.mydomain.com
-$VCENTERLOGIN$=someuser
-$VCENTERPASSWORD$=somepassowrd
-
 
 #### Discovery Part
 # default snmp community
 $SNMPCOMMUNITYREAD$=public
 # what to discover by default
-$NMAPTARGETS$=localhost www.google.fr
+$NMAPTARGETS$=www.google.fr www.bing.com
 
 
-### Asterisk
-$SIPUSER$=user at mydomain.com
\ No newline at end of file

-- 
UNNAMED PROJECT