feat: remove ping tests and refactor mixed mode status reporting

* re-encrypt secrets * remove GeoIP * bump OpenSSL to 3.0.12 * bump OpenVPN to 2.6.8 * bump sniproxy to 0.6.1 * deprecate WANPROXY * despace-entab
belodetek · Dec 8, 2023 · fa1452e · fa1452e
1 parent 31bbef5
commit fa1452e
Show file tree

Hide file tree

Showing 17 changed files with 221 additions and 502 deletions.
diff --git a/.github/workflows/balena.yml b/.github/workflows/balena.yml
@@ -8,6 +8,11 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
+  # cancel jobs in progress for updated PRs, but not merge or tag events
+  cancel-in-progress: ${{ github.event.action == 'synchronize' }}
+
 env:
   ENVIRONMENT: balena-cloud.com
   BLOCK_PREFIX: belodetek/unzoner

diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg
@@ -2,6 +2,6 @@ unzoner/openvpn/client.key:1f2e908d2eac66568e4d4cc2c37967684c0da9cb32a24c970ee82
 unzoner/openvpn/server.key:0817ed6b2ae19fdf1ddab8b507d70e7cbea29fa00674687eb845514539ad2c64
 unzoner/openvpn/ta.key:61a616ec66587848c1a43cc92aa21ad0305e804581f9c2a437929713c4f4edb6
 unzoner/id_rsa:7efaea18eedb4a1b9f9298e0f3d92ceb3f2adc4c29a5e818009a7d88f847296f
-unzoner/.balena/secrets/env:b581220016ab9a0e9bb870baa31c1407caac3ba674ad785d3bffc9cb407f756a
+unzoner/.balena/secrets/env:57af61f0f7fdb6afa4d15d7399358c00957b4358de192eb0d7b048f575e345a1
 unzoner/mgmt.ovpn:b81b41c4cf71cdd490feecadf4bb35c31ed8396ed0fdd61808d4efd73c3031de
 unzoner/openvpn/dh2048.pem:7afe4bea0e57bc35bcd7cdd9e393692c43a88facc64c309a176dc69a66d5a029
diff --git a/unzoner/.balena/balena.yml b/unzoner/.balena/balena.yml
@@ -6,23 +6,22 @@ build-variables:
       # https://en.wikipedia.org/wiki/Bird_Internet_routing_daemon
       - BUILD_BIRD=0
       # https://github.com/openssl/openssl
-      - BUILD_OPENSSL_VERSION=3.0.5
-      - BUILD_OPENSSL=0
+      # Setting up openssh-server (1:8.9p1-3ubuntu0.4) ...
+      # OpenSSL version mismatch. Built against 30000020, you have 30200000
+      - BUILD_OPENSSL_VERSION=3.0.12
+      - BUILD_OPENSSL=1
       # https://gcc.gnu.org/onlinedocs/gcc/AArch64-Options.html
       - AARCH64_OPTIMISE_FLAGS=-O3 -mtune=cortex-a72 -march=armv8-a
       # https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
       - ARM_OPTIMISE_FLAGS=-O3 -mtune=cortex-a53 -mcpu=cortex-a53+crypto -mfpu=crypto-neon-fp-armv8
       # https://github.com/OpenVPN/openvpn
-      - BUILD_OPENVPN_VERSION=2.5.7
-      - BUILD_OPENVPN=0
+      - BUILD_OPENVPN_VERSION=2.6.8
+      - BUILD_OPENVPN=1
       # FIXME: https://sources.debian.org/patches/sniproxy/0.6.0-2/
-      - BUILD_SNIPROXY_VERSION=0.6.0
-      - BUILD_SNIPROXY=0
-      # project abandoned http://wanproxy.org/)
-      - BUILD_WANPROXY_VERSION=0.8.0
-      - BUILD_WANPROXY=0
+      - BUILD_SNIPROXY_VERSION=0.6.1
+      - BUILD_SNIPROXY=1
       # https://nuitka.net/
-      - COMPILE_CODE=0
+      - COMPILE_CODE=1
       # (e.g.) dig +short us.{{ DNS_SUB_DOMAIN }}.{{ DNS_DOMAIN }}
       - DNS_SUB_DOMAIN=blackbox
 

diff --git a/unzoner/.balena/secrets/env.secret b/unzoner/.balena/secrets/env.secret