Current state

diff --git a/.etckeeper b/.etckeeper
index 527b5ddbab115c62827ef9f6ee821c1dd25d58ed..470b1bed71af3f90f0714d2d23df714a86af92e5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5,6 +5,7 @@ mkdir -p './courier-imap/shared'
 mkdir -p './courier-imap/shared.tmp'
 mkdir -p './dpkg/dpkg.cfg.d'
 mkdir -p './foomatic/direct'
+mkdir -p './lvm/cache'
 mkdir -p './php/apache2-php5.4/ext'
 mkdir -p './php/apache2-php5.4/ext-active'
 mkdir -p './php/cgi-php5.4/ext'
@@ -1061,7 +1062,6 @@ maybe chmod 0600 './lvm/archive/vg00_00000.vg'
 maybe chmod 0700 './lvm/backup'
 maybe chmod 0600 './lvm/backup/vg00'
 maybe chmod 0700 './lvm/cache'
-maybe chmod 0600 './lvm/cache/.cache'
 maybe chmod 0644 './lvm/lvm.conf'
 maybe chmod 0644 './machine-id'
 maybe chmod 0755 './mail'
@@ -1597,7 +1597,7 @@ maybe chmod 0644 './stunnel/stunnel.conf'
 maybe chmod 0644 './stunnel/stunnel.pem'
 maybe chmod 0440 './sudoers'
 maybe chmod 0750 './sudoers.d'
-maybe chmod 0644 './sudoers.d/50nagios-plugins'
+maybe chmod 0440 './sudoers.d/50nagios-plugins'
 maybe chmod 0644 './sysctl.conf'
 maybe chmod 0755 './sysctl.d'
 maybe chmod 0644 './sysctl.d/README'

diff --git a/nagios/nrpe.cfg b/nagios/nrpe.cfg
index e5d37bb26f16adf32b94c62ba4d2e1e25e12ffe8..176b002b5c28e37e799537311ca2518a2caab5bb 100644 (file)
--- a/nagios/nrpe.cfg
+++ b/nagios/nrpe.cfg
@@ -236,7 +236,19 @@ command[check_disk]=/usr/lib64/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p
 #command[check_proc_arg]=/usr/lib64/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -a $ARG3$
 command[check_swap]=/usr/lib64/nagios/plugins/check_swap -w $ARG1$ -c $ARG2$
 
-command[check_procs]=/opt/icinga/bin/check-procs.pl -w $ARG1$ -c $ARG2$ -s $ARG3$
-command[check_proc_arg]=/opt/icinga/bin/check-procs.pl -w $ARG1$ -c $ARG2$ -a $ARG3$
-command[check_init_proc]=/opt/icinga/bin/check-procs.pl -i -w $ARG1$ -c $ARG2$ -a $ARG3$
+command[check_nic]=/opt/icinga/bin/check-nic $ARG1$
+command[check_swraid]=/opt/icinga/bin/check_swraid -D $ARG1$ -t $ARG2$
+command[check_swraid_level]=/opt/icinga/bin/check_swraid -D $ARG1$ -t raid_level -l $ARG2$
+command[check_smart]=/opt/icinga/bin/check-smart -D $ARG1$ -w $ARG2$ -c $ARG3$
+
+#command[check_procs]=/opt/icinga/bin/check-procs.pl -w $ARG1$ -c $ARG2$ -s $ARG3$
+#command[check_proc_arg]=/opt/icinga/bin/check-procs.pl -w $ARG1$ -c $ARG2$ -a $ARG3$
+#command[check_init_proc]=/opt/icinga/bin/check-procs.pl -i -w $ARG1$ -c $ARG2$ -a $ARG3$
+
+command[check_procs]=/usr/bin/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+command[check_proc_arg]=/usr/bin/check_procs -w $ARG1$ -c $ARG2$ -a $ARG3$
+command[check_init_proc]=/usr/bin/check_procs -i -w $ARG1$ -c $ARG2$ -a $ARG3$
+
+command[check_vg_free]=/usr/bin/sudo /usr/bin/check_vg_free -w $ARG1$ -c $ARG2$ $ARG3$
+command[check_vg_state]=/usr/bin/sudo /usr/bin/check_vg_state $ARG1$
 

diff --git a/sudoers b/sudoers
index 54483d994894dd512d8c82183601aa534e541065..4f6efc051d7dc5fd1141800a83ab9e35d6d78040 100644 (file)
--- a/sudoers
+++ b/sudoers
@@ -78,6 +78,7 @@ root ALL=(ALL) ALL
 # %wheel ALL=(ALL) NOPASSWD: ALL
 
 frank ALL=(ALL) NOPASSWD: ALL
+nagios ALL=(ALL) NOPASSWD: ALL
 %adm ALL=(ALL) NOPASSWD: ALL
 
 ## Uncomment to allow members of group sudo to execute any command

diff --git a/vim/vimrc.local b/vim/vimrc.local
index 39012aa0b76aa6cbae97c3d076c56b71f0d2a7f0..492bdf927ebae920486ac4c95bdd43c28ef283ed 100644 (file)
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -6,6 +6,8 @@ set modeline
 set showmatch
 set ignorecase
 
+set list listchars=tab:»·,trail:·
+
 if has("multi_byte")
     set encoding=utf-8
     setglobal fileencoding=utf-8