From c843d7cbbb2ce16e2d91d4dcaace0d4792f3887f Mon Sep 17 00:00:00 2001
From: Thomas Martin <tmartin@optiplex.evolix.net>
Date: Tue, 8 Sep 2009 15:00:25 +0200
Subject: [PATCH] Store default configuration values in evocheck.sh, so
 evocheck.cf is only used to overwrite them.

---
 evocheck.cf | 32 ++------------------------------
 evocheck.sh | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/evocheck.cf b/evocheck.cf
index 0bdddc5..983363f 100644
--- a/evocheck.cf
+++ b/evocheck.cf
@@ -1,31 +1,3 @@
 # Configuration for evocheck
-
-IS_TMP_1777=1
-IS_ROOT_0700=1
-IS_VARTMPFS=1
-IS_USRSHARESCRIPTS=1
-IS_SERVEURBASE=1
-IS_LOGROTATECONF=1
-IS_SYSLOGCONF=1
-IS_DEBIANSECURITY=1
-IS_APTITUDEONLY=1
-IS_USRRO=1
-IS_TMPNOEXEC=1
-IS_LISTCHANGESCONF=1
-IS_DPKGWARNING=1
-IS_CUSTOMCRONTAB=1
-IS_CUSTOMSUDOERS=1
-IS_SSHPERMITROOTNO=1
-IS_SSHALLOWUSERS=1
-IS_TMOUTPROFILE=1
-IS_ALERT5BOOT=1
-IS_ALERT5MINIFW=1
-IS_NRPEPERMS=1
-IS_MINIFWPERMS=1
-IS_NRPEDISKS=1
-IS_NRPEPOSTFIX=1
-IS_GRSECPROCS=1
-IS_UMASKSUDOERS=1
-IS_EVOMAINTENANCEUSERS=1
-IS_APACHEMUNIN=1
-IS_MYSQLUTILS=1
+# Use this file to change configuration values defined in evocheck.sh
+# Ex : IS_TMP_1777=0
diff --git a/evocheck.sh b/evocheck.sh
index 43f92a2..0ecfdf2 100644
--- a/evocheck.sh
+++ b/evocheck.sh
@@ -8,6 +8,37 @@
 # Disable LANG
 LANG=C
 
+# Default configuration values
+IS_TMP_1777=1
+IS_ROOT_0700=1
+IS_VARTMPFS=1
+IS_USRSHARESCRIPTS=1
+IS_SERVEURBASE=1
+IS_LOGROTATECONF=1
+IS_SYSLOGCONF=1
+IS_DEBIANSECURITY=1
+IS_APTITUDEONLY=1
+IS_USRRO=1
+IS_TMPNOEXEC=1
+IS_LISTCHANGESCONF=1
+IS_DPKGWARNING=1
+IS_CUSTOMCRONTAB=1
+IS_CUSTOMSUDOERS=1
+IS_SSHPERMITROOTNO=1
+IS_SSHALLOWUSERS=1
+IS_TMOUTPROFILE=1
+IS_ALERT5BOOT=1
+IS_ALERT5MINIFW=1
+IS_NRPEPERMS=1
+IS_MINIFWPERMS=1
+IS_NRPEDISKS=1
+IS_NRPEPOSTFIX=1
+IS_GRSECPROCS=1
+IS_UMASKSUDOERS=1
+IS_EVOMAINTENANCEUSERS=1
+IS_APACHEMUNIN=1
+IS_MYSQLUTILS=1
+
 # Source configuration file
 test -f /etc/evocheck.cf && . /etc/evocheck.cf