From 28ea22e13ef9d3c93d86511519d2de688a7f0e9b Mon Sep 17 00:00:00 2001
From: Samson-W <samson@hardenedlinux.org>
Date: Sat, 11 Apr 2020 18:41:12 +0800
Subject: [PATCH] Remove debian dir and move debian/default to etc/default.cfg,
 modify the associated file.

---
 README-CN.md                                              | 2 +-
 README.md                                                 | 2 +-
 debian/default                                            | 8 --------
 .../AMI/how_to_creating_and_making_an_AMI_public.mkd      | 2 +-
 .../how_to_creating_and_making_a_QEMU_img_for_centos8.mkd | 2 +-
 .../how_to_creating_and_making_a_QEMU_img_for_debian9.mkd | 2 +-
 6 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 debian/default

diff --git a/README-CN.md b/README-CN.md
index 4f737fe..f1ee37e 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -29,7 +29,7 @@ hardening                 [INFO] Treating /home/test/harbian-audit/bin/hardening
 ### 下载及初始化 
 ```console
 $ git clone https://github.com/hardenedlinux/harbian-audit.git && cd harbian-audit
-$ sudo cp debian/default /etc/default/cis-hardening
+$ sudo cp etc/default.cfg /etc/default/cis-hardening
 $ sudo sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening
 $ sudo bin/hardening.sh --init
 ```
diff --git a/README.md b/README.md
index 01f82ce..e656acd 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ hardening                 [INFO] Treating /home/test/harbian-audit/bin/hardening
 
 ```console
 $ git clone https://github.com/hardenedlinux/harbian-audit.git && cd harbian-audit
-$ sudo cp debian/default /etc/default/cis-hardening
+$ sudo cp etc/default.cfg /etc/default/cis-hardening
 $ sudo sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening
 $ sudo bin/hardening.sh --init
 $ sudo bin/hardening.sh --audit-all
diff --git a/debian/default b/debian/default
deleted file mode 100644
index 0217026..0000000
--- a/debian/default
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default file for CIS Debian/CentOS hardening scripts
-
-# Define here root directory for CIS debian/CentOS hardening scripts
-CIS_ROOT_DIR='/opt/cis-hardening'
-# If distor is Debian, set 1; It's default  
-# If distor is CentOS, set 2;
-OS_RELEASE=1
-
diff --git a/docs/complianced_image/AMI/how_to_creating_and_making_an_AMI_public.mkd b/docs/complianced_image/AMI/how_to_creating_and_making_an_AMI_public.mkd
index 3fed1ae..d02379d 100644
--- a/docs/complianced_image/AMI/how_to_creating_and_making_an_AMI_public.mkd
+++ b/docs/complianced_image/AMI/how_to_creating_and_making_an_AMI_public.mkd
@@ -49,7 +49,7 @@ admin@ip:/opt/harbian-audit-master# passwd admin
 
 ##### First audit && apply:
 ```
-admin@ip:/opt/harbian-audit-master$ sudo cp debian/default /etc/default/cis-hardening
+admin@ip:/opt/harbian-audit-master$ sudo cp etc/default.cfg /etc/default/cis-hardening
 admin@ip:/opt/harbian-audit-master$ sudo sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening 
 admin@ip:/opt/harbian-audit-master$ sudo ./bin/hardening.sh --init
 admin@ip:/opt/harbian-audit-master$ sudo ./bin/hardening.sh --audit-all 
diff --git a/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_centos8.mkd b/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_centos8.mkd
index 9e8dafb..aa324f0 100644
--- a/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_centos8.mkd
+++ b/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_centos8.mkd
@@ -61,7 +61,7 @@ root@harbian:/opt# cd harbian-audit-master/
 
 #### Audit && Apply   
 ```
-root@harbian:/opt/harbian-audit-master# cp debian/default /etc/default/cis-hardening 
+root@harbian:/opt/harbian-audit-master# cp etc/default.cfg /etc/default/cis-hardening 
 root@harbian:/opt/harbian-audit-master# sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening  
 root@harbian:/opt/harbian-audit-master#  bash bin/hardening.sh --init  
 root@harbian:/opt/harbian-audit-master# ./bin/hardening.sh --audit-all  
diff --git a/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_debian9.mkd b/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_debian9.mkd
index 5e384f8..284aeeb 100644
--- a/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_debian9.mkd
+++ b/docs/complianced_image/QEMU/how_to_creating_and_making_a_QEMU_img_for_debian9.mkd
@@ -61,7 +61,7 @@ root@harbian:/opt# cd harbian-audit-master/
 
 #### Audit && Apply   
 ```
-root@harbian:/opt/harbian-audit-master# cp debian/default /etc/default/cis-hardening 
+root@harbian:/opt/harbian-audit-master# cp etc/default.cfg /etc/default/cis-hardening 
 root@harbian:/opt/harbian-audit-master# sed -i "s#CIS_ROOT_DIR=.*#CIS_ROOT_DIR='$(pwd)'#" /etc/default/cis-hardening  
 root@harbian:/opt/harbian-audit-master#  bash bin/hardening.sh --init  
 root@harbian:/opt/harbian-audit-master# ./bin/hardening.sh --audit-all