From 9eff5d415cd779f2ad4f86349a87c66ff9d94c17 Mon Sep 17 00:00:00 2001
From: Julio Gutierrez <julio.guti@pm.me>
Date: Sat, 5 Feb 2022 00:34:48 -0600
Subject: [PATCH] update to 3.12.3

---
 Dockerfile                        |  4 ++--
 rootfs/etc/fix-attrs.d/nord_utils |  1 +
 rootfs/usr/bin/nord_config        |  2 +-
 rootfs/usr/bin/nord_migrate       | 18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 rootfs/usr/bin/nord_migrate

diff --git a/Dockerfile b/Dockerfile
index 7a4ac470437..192cc0dcbe6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM s6on/ubuntu:20.04
 LABEL maintainer="Julio Gutierrez julio.guti+nordvpn@pm.me"
 
-ARG NORDVPN_VERSION=3.12.2
+ARG NORDVPN_VERSION=3.12.3
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -y && \
@@ -21,4 +21,4 @@ RUN apt-get update -y && \
 
 COPY /rootfs /
 ENV S6_CMD_WAIT_FOR_SERVICES=1
-CMD nord_login && nord_config && nord_connect && nord_watch
+CMD nord_login && nord_config && nord_connect && nord_migrate && nord_watch
diff --git a/rootfs/etc/fix-attrs.d/nord_utils b/rootfs/etc/fix-attrs.d/nord_utils
index 7df7a7c6256..5a82e9b56cc 100644
--- a/rootfs/etc/fix-attrs.d/nord_utils
+++ b/rootfs/etc/fix-attrs.d/nord_utils
@@ -2,4 +2,5 @@
 /usr/bin/nord_connect false root:root 0755 0755
 /usr/bin/nord_login false root:root 0755 0755
 /usr/bin/nord_private_key false root:root 0755 0755
+/usr/bin/nord_migrate false root:root 0755 0755
 /usr/bin/nord_watch false root:root 0755 0755
diff --git a/rootfs/usr/bin/nord_config b/rootfs/usr/bin/nord_config
index 3539299d5c5..975365c4e5e 100644
--- a/rootfs/usr/bin/nord_config
+++ b/rootfs/usr/bin/nord_config
@@ -5,7 +5,7 @@
 [[ -n ${CYBER_SEC} ]] && nordvpn set cybersec ${CYBER_SEC}
 [[ -n ${OBFUSCATE} ]] && nordvpn set obfuscate ${OBFUSCATE}
 [[ -n ${FIREWALL} ]] && nordvpn set firewall ${FIREWALL}
-#[[ -n ${KILLSWITCH} ]] && nordvpn set killswitch ${KILLSWITCH} Killswitch is enabled by default by iptables
+#[[ -n ${KILLSWITCH} ]] && nordvpn set killswitch ${KILLSWITCH} Killswitch is enabled by default using iptables
 
 [[ -n ${PROTOCOL} ]] && nordvpn set protocol ${PROTOCOL}
 nordvpn set technology ${TECHNOLOGY:-NordLynx}
diff --git a/rootfs/usr/bin/nord_migrate b/rootfs/usr/bin/nord_migrate
new file mode 100644
index 00000000000..9b28e8ed46c
--- /dev/null
+++ b/rootfs/usr/bin/nord_migrate
@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+
+shopt -s nocasematch; if [[ "${TECHNOLOGY:-NordLynx}" =~ "NordLynx" ]]; then
+  echo "############################################################"
+  echo "__  .___  ___. .______     ______   .______     .___________.    ___      .__   __. .___________. "
+  echo "|  | |   \/   | |   _  \   /  __  \  |   _  \    |           |   /   \     |  \ |  | |           |"
+  echo "|  | |  \  /  | |  |_)  | |  |  |  | |  |_)  |   \`---|  |----\`  /  ^  \    |   \|  | \`---|  |----\`"
+  echo "|  | |  |\/|  | |   ___/  |  |  |  | |      /        |  |      /  /_\  \   |  . \`  |     |  |"     
+  echo "|  | |  |  |  | |  |      |  \`--'  | |  |\  \----.   |  |     /  _____  \  |  |\   |     |  |"     
+  echo "|__| |__|  |__| | _|       \______/  | _| \`._____|   |__|    /__/     \__\ |__| \__|     |__|"
+  echo "↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓"
+  echo "Please migrate to the NordLynx container (https://github.com/bubuntux/nordlynx)"
+  echo "Here is your private Key: $(wg show nordlynx private-key)"
+  echo "IP: $(ip -o addr show dev nordlynx | awk '$3 == "inet" {print $4}')"
+  echo "############################################################"
+fi
+
+exit 0
\ No newline at end of file