aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2020-11-06 11:00:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2020-11-06 11:00:33 -0300
commitc3d66da7c162508a7fdfddbf4aaaf2adfc4f7a58 (patch)
tree4b50b1cb677a7a1d6a2df2f4d7840d148c54d6cd
parente7162cbba6161ea316f9415b672d842074bafd4a (diff)
downloadkvmx-c3d66da7c162508a7fdfddbf4aaaf2adfc4f7a58.tar.gz
kvmx-c3d66da7c162508a7fdfddbf4aaaf2adfc4f7a58.tar.bz2
Feat: WIP: ipredator/njalla migration
-rw-r--r--share/provision/files/njalla/etc/ferm/ferm.conf (renamed from share/provision/files/ipredator/etc/ferm/ferm.conf)0
-rw-r--r--share/provision/files/njalla/etc/openvpn/ipredator.conf (renamed from share/provision/files/ipredator/etc/openvpn/ipredator.conf)0
-rw-r--r--share/provision/files/njalla/etc/udev/rules.d/81-vpn-firewall.rules (renamed from share/provision/files/ipredator/etc/udev/rules.d/81-vpn-firewall.rules)0
-rwxr-xr-xshare/provision/files/njalla/usr/local/bin/fermreload.sh (renamed from share/provision/files/ipredator/usr/local/bin/fermreload.sh)0
-rwxr-xr-xshare/provision/njalla (renamed from share/provision/ipredator)25
5 files changed, 12 insertions, 13 deletions
diff --git a/share/provision/files/ipredator/etc/ferm/ferm.conf b/share/provision/files/njalla/etc/ferm/ferm.conf
index a25a3d2..a25a3d2 100644
--- a/share/provision/files/ipredator/etc/ferm/ferm.conf
+++ b/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
index 439f31b..439f31b 100644
--- a/share/provision/files/ipredator/etc/openvpn/ipredator.conf
+++ b/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
index 64d8bd1..64d8bd1 100644
--- 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
diff --git a/share/provision/files/ipredator/usr/local/bin/fermreload.sh b/share/provision/files/njalla/usr/local/bin/fermreload.sh
index cebf7cc..cebf7cc 100755
--- a/share/provision/files/ipredator/usr/local/bin/fermreload.sh
+++ b/share/provision/files/njalla/usr/local/bin/fermreload.sh
diff --git a/share/provision/ipredator b/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"