diff --git a/rootfs/standard/usr/bin/mynode_firewall.sh b/rootfs/standard/usr/bin/mynode_firewall.sh index 1f0eaa35..ffb5a2e2 100755 --- a/rootfs/standard/usr/bin/mynode_firewall.sh +++ b/rootfs/standard/usr/bin/mynode_firewall.sh @@ -22,7 +22,6 @@ ufw allow 3004 comment 'allow LND Admin' ufw allow 3010 comment 'allow RTL' ufw allow 50001 comment 'allow Electrum Server' ufw allow 50002 comment 'allow Electrum Server' -ufw allow 50194 comment 'VPN Access' ufw allow 56881 comment 'allow myNode QuickSync' ufw allow 51413 comment 'allow myNode QuickSync' ufw allow 6771 comment 'allow myNode QuickSync (LPD)' diff --git a/rootfs/standard/usr/bin/mynode_setup_vpn.sh b/rootfs/standard/usr/bin/mynode_setup_vpn.sh index e36d1e1c..0184f883 100755 --- a/rootfs/standard/usr/bin/mynode_setup_vpn.sh +++ b/rootfs/standard/usr/bin/mynode_setup_vpn.sh @@ -141,7 +141,8 @@ verifyFreeDiskSpace() { chooseInterface() { # We use the ethernet port - echo "eth0" > /tmp/pivpnINT + pivpnInterface="eth0" + echo ${pivpnInterface} > /tmp/pivpnINT } avoidStaticIPv4Ubuntu() { @@ -152,6 +153,7 @@ avoidStaticIPv4Ubuntu() { getStaticIPv4Settings() { # Dont prompt for IP echo "Using DHCP address as static IP..." + IPv4dns="8.8.8.8" } setDHCPCD() { @@ -398,6 +400,7 @@ update_repo() { setCustomProto() { # We'll use UDP + pivpnProto="udp" PROTO="udp" $SUDO cp /tmp/pivpnPROTO /etc/pivpn/INSTALL_PROTO } @@ -405,7 +408,8 @@ setCustomProto() { setCustomPort() { # We'll use port 51194 - echo "51194" > /tmp/INSTALL_PORT + PORT=51194 + echo ${PORT} > /tmp/INSTALL_PORT $SUDO cp /tmp/INSTALL_PORT /etc/pivpn/INSTALL_PORT } @@ -494,7 +498,7 @@ confOpenVPN() { # "384" "Use a 384-bit certificate" OFF \ # "521" "Use a 521-bit certificate (paranoid level)" OFF 3>&1 1>&2 2>&3) #fi - ENCRYPT="2048" + ENCRYPT="1024" #exitstatus=$? #if [ $exitstatus != 0 ]; then @@ -905,7 +909,7 @@ displayFinalMessage() { update_dialogs() { # Always "update" - useUpdateVars=true + useUpdateVars=false } clone_or_update_repos() { diff --git a/rootfs/standard/var/www/mynode/mynode.py b/rootfs/standard/var/www/mynode/mynode.py index dd0bee55..e5cbb544 100644 --- a/rootfs/standard/var/www/mynode/mynode.py +++ b/rootfs/standard/var/www/mynode/mynode.py @@ -1,6 +1,6 @@ from config import * -from flask import Flask, render_template, Markup, send_from_directory, redirect, request +from flask import Flask, render_template, Markup, send_from_directory, redirect, request, url_for from bitcoind import mynode_bitcoind from bitcoin_cli import mynode_bitcoin_cli if CONFIG["electrs_enabled"]: @@ -15,6 +15,7 @@ from bitcoin_info import * from lightning_info import * from messages import get_message from thread_functions import * +import pam import random import logging import logging.handlers