From 7c8e98198e1389695d7bd70b507d0e6493e0923e Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Thu, 7 Mar 2019 18:15:16 +0100
Subject: [PATCH] Fis some error, adjust docu.

---
 README.systemd.server       |  4 ++--
 conf/load_modules_ipv4.conf | 12 ++++++------
 conf/main_ipv4.conf.sample  | 25 -------------------------
 ip6t-firewall-server        |  2 +-
 4 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/README.systemd.server b/README.systemd.server
index d507ad0..1b03f90 100644
--- a/README.systemd.server
+++ b/README.systemd.server
@@ -35,8 +35,8 @@ cp -a /usr/local/src/ipt-server/conf/ban_ipv6.list.sample /etc/ipt-firewall/ban_
 # -    /etc/ipt-firewall/interfaces_ipv4.conf
 # -    /etc/ipt-firewall/main_ipv4.conf
 # -
-cp /usr/local/src/ipt-server/conf/interfaces_ipv4.conf.sample /etc/ipt-firewall/
-cp /usr/local/src/ipt-server/conf/main_ipv4.conf.sample /etc/ipt-firewall/
+cp /usr/local/src/ipt-server/conf/interfaces_ipv4.conf.sample /etc/ipt-firewall/interfaces_ipv4.conf
+cp /usr/local/src/ipt-server/conf/main_ipv4.conf.sample /etc/ipt-firewall/main_ipv4.conf
 
 vim /etc/ipt-firewall/interfaces_ipv4.conf
 vim /etc/ipt-firewall/main_ipv4.conf
diff --git a/conf/load_modules_ipv4.conf b/conf/load_modules_ipv4.conf
index a0dbae9..669d836 100644
--- a/conf/load_modules_ipv4.conf
+++ b/conf/load_modules_ipv4.conf
@@ -38,16 +38,16 @@ iptable_nat
 # -
 # -      ipt -A OUTPUT -t raw -p tcp --dport 21 -j CT --helper ftp 
 # -    
-/sbin/modprobe nf_conntrack nf_conntrack_helper=0 > /dev/null 2>&1
+nf_conntrack nf_conntrack_helper=0
 
-/sbin/modprobe nf_conntrack_ftp > /dev/null 2>&1
-/sbin/modprobe nf_nat > /dev/null 2>&1
-/sbin/modprobe nf_nat_ftp > /dev/null 2>&1
+nf_conntrack_ftp
+nf_nat
+nf_nat_ftp
 
 ## - Load modules for SIP VOIP
 ## -
-#/sbin/modprobe nf_conntrack_sip > /dev/null 2>&1
-#/sbin/modprobe nf_nat_sip > /dev/null 2>&1
+#nf_conntrack_sip
+#nf_nat_sip
 
 
 # - Load kernel nf_log modules for IPv4 netfilter userspace logging
diff --git a/conf/main_ipv4.conf.sample b/conf/main_ipv4.conf.sample
index d11044d..f6d6d3a 100644
--- a/conf/main_ipv4.conf.sample
+++ b/conf/main_ipv4.conf.sample
@@ -97,31 +97,6 @@ xymon_port=1984
 munin_remote_port="4949"
 
 
-# -------------
-# --- Network Interfaces
-# -------------
-
-# - Extern IP Addresses on this Host
-# -
-# NOT IN USE
-ext_1_ip=""
-# NOT IN USE
-ext_2_ip=""
-# NOT IN USE
-ext_3_ip=""
-
-ext_ips="$ext_1_ip $ext_2_ip $ext_3_ip"
-
-# NOT IN USE
-local_1_ip=""
-# NOT IN USE
-local_2_ip=""
-# NOT IN USE
-local_2_ip=""
-
-broadcast_ips=""
-
-
 # -------------
 # ---- Restrict local Servive to given (extern) IP-Address/Network
 # -------------
diff --git a/ip6t-firewall-server b/ip6t-firewall-server
index 570116a..4009a1c 100755
--- a/ip6t-firewall-server
+++ b/ip6t-firewall-server
@@ -19,7 +19,7 @@ ipt_conf_dir="/etc/ipt-firewall"
 
 inc_functions_file="${ipt_conf_dir}/include_functions.conf"
 
-load_modules_file=${ipt_conf_dir}/load_modules_ipv4.conf
+load_modules_file=${ipt_conf_dir}/load_modules_ipv6.conf
 
 conf_logging=${ipt_conf_dir}/logging_ipv6.conf
 conf_default_ports=${ipt_conf_dir}/default_ports.conf