From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 6 Nov 2020 14:00:33 +0000 (-0300)
Subject: Feat: WIP: ipredator/njalla migration
X-Git-Tag: 0.1.0~68
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c3d66da7c162508a7fdfddbf4aaaf2adfc4f7a58;p=kvmx.git

Feat: WIP: ipredator/njalla migration
---

diff --git a/share/provision/files/ipredator/etc/ferm/ferm.conf b/share/provision/files/njalla/etc/ferm/ferm.conf
similarity index 100%
rename from share/provision/files/ipredator/etc/ferm/ferm.conf
rename to share/provision/files/njalla/etc/ferm/ferm.conf
diff --git a/share/provision/files/ipredator/etc/openvpn/ipredator.conf b/share/provision/files/njalla/etc/openvpn/ipredator.conf
similarity index 100%
rename from share/provision/files/ipredator/etc/openvpn/ipredator.conf
rename to share/provision/files/njalla/etc/openvpn/ipredator.conf
diff --git a/share/provision/files/ipredator/etc/udev/rules.d/81-vpn-firewall.rules b/share/provision/files/njalla/etc/udev/rules.d/81-vpn-firewall.rules
similarity index 100%
rename from share/provision/files/ipredator/etc/udev/rules.d/81-vpn-firewall.rules
rename to share/provision/files/njalla/etc/udev/rules.d/81-vpn-firewall.rules
diff --git a/share/provision/files/ipredator/usr/local/bin/fermreload.sh b/share/provision/files/njalla/usr/local/bin/fermreload.sh
similarity index 100%
rename from share/provision/files/ipredator/usr/local/bin/fermreload.sh
rename to share/provision/files/njalla/usr/local/bin/fermreload.sh
diff --git a/share/provision/ipredator b/share/provision/njalla
similarity index 61%
rename from share/provision/ipredator
rename to share/provision/njalla
index ca762c9..9598d8c 100755
--- a/share/provision/ipredator
+++ b/share/provision/njalla
@@ -30,21 +30,20 @@ APT_INSTALL="sudo LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y"
 $DIRNAME/vpn $HOSTNAME $DOMAIN $MIRROR
 
 # Firewall
-# See https://blog.ipredator.se/linux-firewall-howto.html
 $APT_INSTALL ferm ulogd2 ulogd2-pcap
-sudo cp $DIRNAME/files/ipredator/etc/ferm/ferm.conf /etc/ferm
-sudo cp $DIRNAME/files/ipredator/etc/udev/rules.d/81-vpn-firewall.rules /etc/udev/rules.d
-sudo cp $DIRNAME/files/ipredator/usr/local/bin/fermreload.sh /usr/local/bin
+sudo cp $DIRNAME/files/njalla/etc/ferm/ferm.conf /etc/ferm
+sudo cp $DIRNAME/files/njalla/etc/udev/rules.d/81-vpn-firewall.rules /etc/udev/rules.d
+sudo cp $DIRNAME/files/njalla/usr/local/bin/fermreload.sh /usr/local/bin
 sudo chmod 555 /usr/local/bin/fermreload.sh
 sudo sed -i -e 's/^ENABLED=.*$/ENABLED="yes"/' /etc/default/ferm
 sudo service ferm restart
 
-# IPredator 
-# See https://www.ipredator.se/guide/openvpn/debian/native
-sudo cp $DIRNAME/files/ipredator/etc/openvpn/ipredator.conf /etc/openvpn
-sudo touch /etc/openvpn/ipredator.auth
-sudo chown root:root /etc/openvpn/ipredator.conf
-sudo chown root:root /etc/openvpn/ipredator.auth
-sudo chmod 400 /etc/openvpn/ipredator.conf
-sudo chmod 400 /etc/openvpn/ipredator.auth
-echo "Please set user/password at /etc/openvpn/ipredator.auth"
+# Njalla
+#sudo cp $DIRNAME/files/njalla/etc/openvpn/njalla.conf /etc/openvpn
+#sudo touch /etc/openvpn/njalla.auth
+#sudo chown root:root /etc/openvpn/njalla.conf
+#sudo chown root:root /etc/openvpn/njalla.auth
+#sudo chmod 400 /etc/openvpn/njalla.conf
+#sudo chmod 400 /etc/openvpn/njalla.auth
+#echo "Please set user/password at /etc/openvpn/njalla.auth"
+echo "Please configure /etc/openvpn/njalla.conf"