From 03b8bbcc95a7c6c7cd00572816a2443c46637ac5 Mon Sep 17 00:00:00 2001
From: Mitchell Krog <mitchellkrog@gmail.com>
Date: Sat, 29 Jun 2019 10:58:42 +0200
Subject: [PATCH] Reduce Line Breaks in Tests / Rename Conf Directories

---
 .../.keep                                                 | 0
 .../bots.d/.keep                                          | 0
 .../bots.d/bad-referrer-words.conf                        | 0
 .../bots.d/blacklist-domains.conf                         | 0
 .../bots.d/blacklist-ips.conf                             | 0
 .../bots.d/blacklist-user-agents.conf                     | 0
 .../bots.d/blockbots.conf                                 | 0
 .../bots.d/custom-bad-referrers.conf                      | 0
 .../bots.d/ddos.conf                                      | 0
 .../bots.d/whitelist-domains.conf                         | 0
 .../bots.d/whitelist-ips.conf                             | 0
 .../conf.d/.keep                                          | 0
 .../conf.d/botblocker-nginx-settings.conf                 | 0
 .../conf.d/globalblacklist.conf                           | 0
 .../default.vhost                                         | 0
 .../nginx.conf                                            | 0
 .../{_conf_files_whitelist => conf_files_whitelist}/.keep | 0
 .../bots.d/.keep                                          | 0
 .../bots.d/bad-referrer-words.conf                        | 0
 .../bots.d/blacklist-domains.conf                         | 0
 .../bots.d/blacklist-ips.conf                             | 0
 .../bots.d/blacklist-user-agents.conf                     | 0
 .../bots.d/blockbots.conf                                 | 0
 .../bots.d/custom-bad-referrers.conf                      | 0
 .../bots.d/ddos.conf                                      | 0
 .../bots.d/whitelist-domains.conf                         | 0
 .../bots.d/whitelist-ips.conf                             | 0
 .../conf.d/.keep                                          | 0
 .../conf.d/botblocker-nginx-settings.conf                 | 0
 .../conf.d/globalblacklist.conf                           | 0
 .../default.vhost                                         | 0
 .../nginx.conf                                            | 0
 .dev-tools/test-blocker-whitelist-ips.sh                  | 8 ++++----
 .dev-tools/test-blocker-whitelist.sh                      | 8 ++++----
 34 files changed, 8 insertions(+), 8 deletions(-)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/.keep (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/.keep (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/conf.d/.keep (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/default.vhost (100%)
 rename .dev-tools/{_conf_files_ip_whitelist => conf_files_ip_whitelist}/nginx.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/.keep (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/.keep (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/bad-referrer-words.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/blacklist-domains.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/blacklist-ips.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/blacklist-user-agents.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/blockbots.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/custom-bad-referrers.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/ddos.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/whitelist-domains.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/bots.d/whitelist-ips.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/conf.d/.keep (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/conf.d/botblocker-nginx-settings.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/conf.d/globalblacklist.conf (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/default.vhost (100%)
 rename .dev-tools/{_conf_files_whitelist => conf_files_whitelist}/nginx.conf (100%)

diff --git a/.dev-tools/_conf_files_ip_whitelist/.keep b/.dev-tools/conf_files_ip_whitelist/.keep
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/.keep
rename to .dev-tools/conf_files_ip_whitelist/.keep
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/.keep b/.dev-tools/conf_files_ip_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/.keep
rename to .dev-tools/conf_files_ip_whitelist/bots.d/.keep
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/blockbots.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/blockbots.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/ddos.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/ddos.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/conf_files_ip_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/conf_files_ip_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/conf.d/.keep b/.dev-tools/conf_files_ip_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/conf.d/.keep
rename to .dev-tools/conf_files_ip_whitelist/conf.d/.keep
diff --git a/.dev-tools/_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/conf_files_ip_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/conf.d/globalblacklist.conf b/.dev-tools/conf_files_ip_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/conf_files_ip_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_ip_whitelist/default.vhost b/.dev-tools/conf_files_ip_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/default.vhost
rename to .dev-tools/conf_files_ip_whitelist/default.vhost
diff --git a/.dev-tools/_conf_files_ip_whitelist/nginx.conf b/.dev-tools/conf_files_ip_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_ip_whitelist/nginx.conf
rename to .dev-tools/conf_files_ip_whitelist/nginx.conf
diff --git a/.dev-tools/_conf_files_whitelist/.keep b/.dev-tools/conf_files_whitelist/.keep
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/.keep
rename to .dev-tools/conf_files_whitelist/.keep
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/.keep b/.dev-tools/conf_files_whitelist/bots.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/.keep
rename to .dev-tools/conf_files_whitelist/bots.d/.keep
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/bad-referrer-words.conf b/.dev-tools/conf_files_whitelist/bots.d/bad-referrer-words.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/bad-referrer-words.conf
rename to .dev-tools/conf_files_whitelist/bots.d/bad-referrer-words.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/blacklist-domains.conf b/.dev-tools/conf_files_whitelist/bots.d/blacklist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/blacklist-domains.conf
rename to .dev-tools/conf_files_whitelist/bots.d/blacklist-domains.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/blacklist-ips.conf b/.dev-tools/conf_files_whitelist/bots.d/blacklist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/blacklist-ips.conf
rename to .dev-tools/conf_files_whitelist/bots.d/blacklist-ips.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/blacklist-user-agents.conf b/.dev-tools/conf_files_whitelist/bots.d/blacklist-user-agents.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/blacklist-user-agents.conf
rename to .dev-tools/conf_files_whitelist/bots.d/blacklist-user-agents.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/blockbots.conf b/.dev-tools/conf_files_whitelist/bots.d/blockbots.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/blockbots.conf
rename to .dev-tools/conf_files_whitelist/bots.d/blockbots.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/custom-bad-referrers.conf b/.dev-tools/conf_files_whitelist/bots.d/custom-bad-referrers.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/custom-bad-referrers.conf
rename to .dev-tools/conf_files_whitelist/bots.d/custom-bad-referrers.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/ddos.conf b/.dev-tools/conf_files_whitelist/bots.d/ddos.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/ddos.conf
rename to .dev-tools/conf_files_whitelist/bots.d/ddos.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/whitelist-domains.conf b/.dev-tools/conf_files_whitelist/bots.d/whitelist-domains.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/whitelist-domains.conf
rename to .dev-tools/conf_files_whitelist/bots.d/whitelist-domains.conf
diff --git a/.dev-tools/_conf_files_whitelist/bots.d/whitelist-ips.conf b/.dev-tools/conf_files_whitelist/bots.d/whitelist-ips.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/bots.d/whitelist-ips.conf
rename to .dev-tools/conf_files_whitelist/bots.d/whitelist-ips.conf
diff --git a/.dev-tools/_conf_files_whitelist/conf.d/.keep b/.dev-tools/conf_files_whitelist/conf.d/.keep
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/conf.d/.keep
rename to .dev-tools/conf_files_whitelist/conf.d/.keep
diff --git a/.dev-tools/_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf b/.dev-tools/conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
rename to .dev-tools/conf_files_whitelist/conf.d/botblocker-nginx-settings.conf
diff --git a/.dev-tools/_conf_files_whitelist/conf.d/globalblacklist.conf b/.dev-tools/conf_files_whitelist/conf.d/globalblacklist.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/conf.d/globalblacklist.conf
rename to .dev-tools/conf_files_whitelist/conf.d/globalblacklist.conf
diff --git a/.dev-tools/_conf_files_whitelist/default.vhost b/.dev-tools/conf_files_whitelist/default.vhost
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/default.vhost
rename to .dev-tools/conf_files_whitelist/default.vhost
diff --git a/.dev-tools/_conf_files_whitelist/nginx.conf b/.dev-tools/conf_files_whitelist/nginx.conf
similarity index 100%
rename from .dev-tools/_conf_files_whitelist/nginx.conf
rename to .dev-tools/conf_files_whitelist/nginx.conf
diff --git a/.dev-tools/test-blocker-whitelist-ips.sh b/.dev-tools/test-blocker-whitelist-ips.sh
index 72ec67865..82472e2da 100755
--- a/.dev-tools/test-blocker-whitelist-ips.sh
+++ b/.dev-tools/test-blocker-whitelist-ips.sh
@@ -98,10 +98,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_ip_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_ip_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_ip_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_ip_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_ip_whitelist/nginx.conf
 }
 
 blacklistOwnIP () {
diff --git a/.dev-tools/test-blocker-whitelist.sh b/.dev-tools/test-blocker-whitelist.sh
index e3a2363a4..3b7a0029f 100755
--- a/.dev-tools/test-blocker-whitelist.sh
+++ b/.dev-tools/test-blocker-whitelist.sh
@@ -240,10 +240,10 @@ echo "${bold}${green}-----------------------------------------------------------
 echo "${bold}${green}Make Backup all conf files and folders used during this test"
 echo "${bold}${green}------------------------------------------------------------"
 printf "\n"
-sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_whitelist/bots.d/
-sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_whitelist/conf.d/
-sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_whitelist/default.vhost
-sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/_conf_files_whitelist/nginx.conf
+sudo cp /etc/nginx/bots.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/bots.d/
+sudo cp /etc/nginx/conf.d/* ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/conf.d/
+sudo cp /etc/nginx/sites-available/default.vhost ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/default.vhost
+sudo cp /etc/nginx/nginx.conf ${TRAVIS_BUILD_DIR}/.dev-tools/conf_files_whitelist/nginx.conf
 }
 
 # -----------