From 007180149a8be84219eeb554165288f6e00144cd Mon Sep 17 00:00:00 2001
From: "thibault.dewailly" <thibault.dewailly@ovh.net>
Date: Mon, 4 Apr 2016 16:50:57 +0200
Subject: [PATCH] 2.5_var_partition.sh + refacto

---
 ...tall_Updates.sh => 1.1_install_updates.sh} |  0
 ..._tmp_Partition.sh => 2.1_tmp_partition.sh} |  0
 bin/hardening/2.5_var_partition.sh            | 69 +++++++++++++++++++
 ...ll_Updates.cfg => 1.1_install_updates.cfg} |  0
 ...mp_Partition.cfg => 2.1_tmp_partition.cfg} |  0
 etc/conf.d/2.5_var_partition.cfg              |  2 +
 6 files changed, 71 insertions(+)
 rename bin/hardening/{1.1_Install_Updates.sh => 1.1_install_updates.sh} (100%)
 rename bin/hardening/{2.1_tmp_Partition.sh => 2.1_tmp_partition.sh} (100%)
 create mode 100755 bin/hardening/2.5_var_partition.sh
 rename etc/conf.d/{1.1_Install_Updates.cfg => 1.1_install_updates.cfg} (100%)
 rename etc/conf.d/{2.1_tmp_Partition.cfg => 2.1_tmp_partition.cfg} (100%)
 create mode 100644 etc/conf.d/2.5_var_partition.cfg

diff --git a/bin/hardening/1.1_Install_Updates.sh b/bin/hardening/1.1_install_updates.sh
similarity index 100%
rename from bin/hardening/1.1_Install_Updates.sh
rename to bin/hardening/1.1_install_updates.sh
diff --git a/bin/hardening/2.1_tmp_Partition.sh b/bin/hardening/2.1_tmp_partition.sh
similarity index 100%
rename from bin/hardening/2.1_tmp_Partition.sh
rename to bin/hardening/2.1_tmp_partition.sh
diff --git a/bin/hardening/2.5_var_partition.sh b/bin/hardening/2.5_var_partition.sh
new file mode 100755
index 0000000..3a0fed6
--- /dev/null
+++ b/bin/hardening/2.5_var_partition.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+#
+# CIS Debian 7 Hardening
+#
+
+#
+# 2.5 Create Separate Partition for /var (Scored)
+#
+
+set -e # One error, it's over
+set -u # One variable unset, it's over
+
+# Quick factoring as many script use the same logic
+PARTITION="/var"
+
+# This function will be called if the script status is on enabled / audit mode
+audit () {
+    info "Verifying that $PARTITION is a partition"
+    FNRET=0
+    is_a_partition "$PARTITION"
+    if [ $FNRET -gt 0 ]; then
+        crit "$PARTITION is not a partition"
+        FNRET=2
+    else
+        ok "$PARTITION is a partition"
+        is_mounted "$PARTITION"
+        if [ $FNRET -gt 0 ]; then
+            warn "$PARTITION is not mounted"
+            FNRET=1
+        else
+            ok "$PARTITION is mounted"
+        fi
+    fi
+     
+    :
+}
+
+# This function will be called if the script status is on enabled mode
+apply () {
+    if [ $FNRET = 0 ]; then
+        ok "$PARTITION is correctly set"
+    elif [ $FNRET = 2 ]; then
+        crit "$PARTITION is not a partition, correct this by yourself, I cannot help you here"
+    else
+        info "mounting $PARTITION"
+        mount $PARTITION
+    fi
+}
+
+# This function will check config parameters required
+check_config() {
+    # No parameter for this script
+    :
+}
+
+# Source Root Dir Parameter
+if [ ! -r /etc/default/cis-hardenning ]; then
+    echo "There is no /etc/default/cis-hardenning file, cannot source CIS_ROOT_DIR variable, aborting"
+    exit 128
+else
+    . /etc/default/cis-hardenning
+    if [ -z $CIS_ROOT_DIR ]; then
+        echo "No CIS_ROOT_DIR variable, aborting"
+    fi
+fi 
+
+# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
+[ -r $CIS_ROOT_DIR/lib/main.sh ] && . $CIS_ROOT_DIR/lib/main.sh
diff --git a/etc/conf.d/1.1_Install_Updates.cfg b/etc/conf.d/1.1_install_updates.cfg
similarity index 100%
rename from etc/conf.d/1.1_Install_Updates.cfg
rename to etc/conf.d/1.1_install_updates.cfg
diff --git a/etc/conf.d/2.1_tmp_Partition.cfg b/etc/conf.d/2.1_tmp_partition.cfg
similarity index 100%
rename from etc/conf.d/2.1_tmp_Partition.cfg
rename to etc/conf.d/2.1_tmp_partition.cfg
diff --git a/etc/conf.d/2.5_var_partition.cfg b/etc/conf.d/2.5_var_partition.cfg
new file mode 100644
index 0000000..acee522
--- /dev/null
+++ b/etc/conf.d/2.5_var_partition.cfg
@@ -0,0 +1,2 @@
+# Configuration for script of same name
+status=disabled