From 640cc1cd1aef02ee7ba6972d63fdb5c18be0305f Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 31 Jul 2020 13:16:17 +0200
Subject: [PATCH] Fixed oopsie

---
 CMS/nextcloud/conf.sh                               | 2 +-
 CMS/wordpress/conf.sh                               | 2 +-
 CoreModules/generic/conf.sh                         | 4 ++--
 config/fail2ban/Jails/{sshd-jail.jail => sshd.jail} | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename config/fail2ban/Jails/{sshd-jail.jail => sshd.jail} (100%)

diff --git a/CMS/nextcloud/conf.sh b/CMS/nextcloud/conf.sh
index 70201d3..9a6cabd 100644
--- a/CMS/nextcloud/conf.sh
+++ b/CMS/nextcloud/conf.sh
@@ -10,7 +10,7 @@ chmod 774 -R /var/log/nextcloud
 ln -s /var/www/"$domain"/html/data/nextcloud.log /var/log/nextcloud/"$sitename"
 
 #fail2ban
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/nextcloud_unconfigured -O /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
+wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/nextcloud_unconfigured -O /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
 sed -i 's/SITEname/'$sitename'/' /etc/fail2ban/jail.d/"$sitename"-nextcloud.local
 
 systemctl reload php"$phpver"-fpm
\ No newline at end of file
diff --git a/CMS/wordpress/conf.sh b/CMS/wordpress/conf.sh
index 11bb47b..5fb66c9 100644
--- a/CMS/wordpress/conf.sh
+++ b/CMS/wordpress/conf.sh
@@ -41,7 +41,7 @@ systemctl reload php"$phpver"-fpm
 
 #fail2ban
 if [ ! -f /etc/fail2ban/jail.d/wordpress-syslog.local ]; then
-    wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Filters/wordpress-syslog.jail -O /etc/fail2ban/jail.d/wordpress-syslog.local
+    wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/wordpress-syslog.jail -O /etc/fail2ban/jail.d/wordpress-syslog.local
 fi
 
 #Setting Permsissions
diff --git a/CoreModules/generic/conf.sh b/CoreModules/generic/conf.sh
index b3a227e..1e64f2e 100644
--- a/CoreModules/generic/conf.sh
+++ b/CoreModules/generic/conf.sh
@@ -39,5 +39,5 @@ wget -q -t7 https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpr
 wget -q -t7 https://plugins.svn.wordpress.org/wp-fail2ban/trunk/filters.d/wordpress-soft.conf -O /etc/fail2ban/filter.d/wordpress-soft.local
 
 #General jails
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/sshd.jail -O /etc/fail2ban/jail.d/sshd.local
-wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/phpmyadmin.jail -O /etc/fail2ban/jail.d/phpmyadmin.local
\ No newline at end of file
+wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/sshd.jail -O /etc/fail2ban/jail.d/sshd.local
+wget -q -t7 "$repo"/raw/branch/"$branch"/config/fail2ban/Jails/phpmyadmin.jail -O /etc/fail2ban/jail.d/phpmyadmin.local
\ No newline at end of file
diff --git a/config/fail2ban/Jails/sshd-jail.jail b/config/fail2ban/Jails/sshd.jail
similarity index 100%
rename from config/fail2ban/Jails/sshd-jail.jail
rename to config/fail2ban/Jails/sshd.jail