From ef5f90e02cdc5da33ba199ca034a23e96bcc6541 Mon Sep 17 00:00:00 2001
From: ChiefGyk <alon@ganon.me>
Date: Wed, 29 Jun 2016 09:38:08 -0400
Subject: [PATCH] changed name from blocklist to blacklist to keep more uniform

---
 conf/{blocklist => blacklist}/blocklist | 0
 setup/{blocklist.sh => blacklist.sh}    | 2 +-
 setup/start.sh                          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename conf/{blocklist => blacklist}/blocklist (100%)
 rename setup/{blocklist.sh => blacklist.sh} (93%)

diff --git a/conf/blocklist/blocklist b/conf/blacklist/blocklist
similarity index 100%
rename from conf/blocklist/blocklist
rename to conf/blacklist/blocklist
diff --git a/setup/blocklist.sh b/setup/blacklist.sh
similarity index 93%
rename from setup/blocklist.sh
rename to setup/blacklist.sh
index add7a64a..bc4922ee 100644
--- a/setup/blocklist.sh
+++ b/setup/blacklist.sh
@@ -12,7 +12,7 @@ echo iptables-persistent iptables-persistent/autosave_v6 boolean true | debconf-
 apt_install -y ipset 
 ipset create blacklist hash:net
 iptables -I INPUT -m set --match-set blacklist src -j DROP
-cp conf/blocklist/blocklist /etc/cron.daily/blocklist
+cp conf/blacklist/blacklist /etc/cron.daily/blacklist
 chmod a+x /etc/cron.daily/blacklist
 time /etc/cron.daily/blacklist
 apt_install -y iptables-persistent
diff --git a/setup/start.sh b/setup/start.sh
index f4af0d07..4a39df48 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -128,7 +128,7 @@ management/ssl_certificates.py -q
 source setup/firstuser.sh
 
 #Setup Blocklist
-source setup/blocklist.sh
+source setup/blacklist.sh
 
 # Done.
 echo