From a6859caa568789918c66f193c7f13e45bbfac2c9 Mon Sep 17 00:00:00 2001
From: Victor <victor@xirion.net>
Date: Sun, 21 May 2023 10:28:06 +0200
Subject: [PATCH] fix some bugs

---
 flake.lock                                    | 24 +++++++++----------
 nixos/hosts/hades/nginx/configuration.nix     |  5 +++-
 nixos/hosts/olympus/nginx/configuration.nix   |  1 +
 .../hosts/olympus/wireguard/configuration.nix |  2 +-
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index fc08d98..d4dce04 100644
--- a/flake.lock
+++ b/flake.lock
@@ -502,11 +502,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684484967,
-        "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=",
+        "lastModified": 1684596126,
+        "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715",
+        "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d",
         "type": "github"
       },
       "original": {
@@ -815,11 +815,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1684502756,
-        "narHash": "sha256-7ssIPaLW2ncTApmExLSoqomPBlubNyUWm/SZYVgKhpI=",
+        "lastModified": 1684612454,
+        "narHash": "sha256-15vluZKXxC76FqAryST1QrUVE7Xlwkrs7lrPTQGYIz0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a13191189f5d8a7e515155c24eb4e346aa4752f4",
+        "rev": "8bf3e834daedadc6d0f4172616b2bdede1109c48",
         "type": "github"
       },
       "original": {
@@ -931,11 +931,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1684488481,
-        "narHash": "sha256-NLHSxDUxw/Epw8CRk2cDPt3Zaaw1Zvbgvr2axNGQHds=",
+        "lastModified": 1684615967,
+        "narHash": "sha256-L5d96HpuKble8AzWnYzQNxrSszoJLn2f4xocxFNnnA0=",
         "owner": "pta2002",
         "repo": "nixvim",
-        "rev": "1d478841f8bf84f3b69095984aa74c56abb86ffa",
+        "rev": "2da04fa4add8b8bb25156de4f5ef4592f5214ef5",
         "type": "github"
       },
       "original": {
@@ -946,11 +946,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1684500955,
-        "narHash": "sha256-EJUdpm4lkMn+/HUl3NSHutK+jDLdOHvGBWgz8RlT6Ck=",
+        "lastModified": 1684612984,
+        "narHash": "sha256-XqWVrtHiY7r/NJMDS02i1kj3Q7BOU7BnfQfEd6v3ZIE=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "98294130adb4c09ac5f66e83bf98d80b7853f1d3",
+        "rev": "3c932dd06b0a537b890e1fd3e31deceb1ac3dea3",
         "type": "github"
       },
       "original": {
diff --git a/nixos/hosts/hades/nginx/configuration.nix b/nixos/hosts/hades/nginx/configuration.nix
index a9ed406..98b27f3 100644
--- a/nixos/hosts/hades/nginx/configuration.nix
+++ b/nixos/hosts/hades/nginx/configuration.nix
@@ -15,6 +15,8 @@ let
 in {
   imports = [ ];
 
+  nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1t" ];
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -70,6 +72,7 @@ in {
           allow 10.10.10.1/24;
           allow 192.168.0.0/23;
           allow 80.60.83.220;
+          allow 83.128.154.23;
           allow 195.85.167.32/29;
           deny all;
         '';
@@ -99,7 +102,7 @@ in {
         proxyWebsockets = true;
       };
 
-      locations."api/v1/streaming" = {
+      locations."/api/v1/streaming" = {
         proxyPass = "http://192.168.0.138:55000";
         proxyWebsockets = true;
       };
diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix
index 8e2a471..83076ac 100644
--- a/nixos/hosts/olympus/nginx/configuration.nix
+++ b/nixos/hosts/olympus/nginx/configuration.nix
@@ -85,6 +85,7 @@ in {
             allow 10.42.42.0/23;
             allow 192.168.0.0/23;
             allow 80.60.83.220;
+            allow 83.128.154.23;
             allow 195.85.167.32/29;
             deny all;
           '';
diff --git a/nixos/hosts/olympus/wireguard/configuration.nix b/nixos/hosts/olympus/wireguard/configuration.nix
index 9b5ed7e..59fefa8 100644
--- a/nixos/hosts/olympus/wireguard/configuration.nix
+++ b/nixos/hosts/olympus/wireguard/configuration.nix
@@ -77,7 +77,7 @@ in {
         # https://docs.opnsense.org/manual/how-tos/wireguard-s2s.html
         publicKey = "KgqLhmUMX6kyTjRoa/GOCrZOvXNE5HWYuOr/T3v8/VI=";
         allowedIPs = [ "10.100.0.5/32" "192.168.0.0/23" "10.10.10.0/24" ];
-        endpoint = "80.60.83.220:51820";
+        endpoint = "83.128.154.23:51820";
         persistentKeepalive = 25;
       }
     ];