v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

fix some bugs
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Details

Browse source
This commit is contained in:
Vivian 2023-05-21 10:28:06 +02:00
parent 95a1a28e91
commit a6859caa56
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684484967, "lastModified": 1684596126,
"narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=", "narHash": "sha256-4RZZmygeEXpuBqEXGs38ZAcWjWKGwu13Iqbxub6wuJk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715", "rev": "27ef11f0218d9018ebb2948d40133df2b1de622d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,11 +815,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1684502756, "lastModified": 1684612454,
"narHash": "sha256-7ssIPaLW2ncTApmExLSoqomPBlubNyUWm/SZYVgKhpI=", "narHash": "sha256-15vluZKXxC76FqAryST1QrUVE7Xlwkrs7lrPTQGYIz0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a13191189f5d8a7e515155c24eb4e346aa4752f4", "rev": "8bf3e834daedadc6d0f4172616b2bdede1109c48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -931,11 +931,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1684488481, "lastModified": 1684615967,
"narHash": "sha256-NLHSxDUxw/Epw8CRk2cDPt3Zaaw1Zvbgvr2axNGQHds=", "narHash": "sha256-L5d96HpuKble8AzWnYzQNxrSszoJLn2f4xocxFNnnA0=",
"owner": "pta2002", "owner": "pta2002",
"repo": "nixvim", "repo": "nixvim",
"rev": "1d478841f8bf84f3b69095984aa74c56abb86ffa", "rev": "2da04fa4add8b8bb25156de4f5ef4592f5214ef5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -946,11 +946,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1684500955, "lastModified": 1684612984,
"narHash": "sha256-EJUdpm4lkMn+/HUl3NSHutK+jDLdOHvGBWgz8RlT6Ck=", "narHash": "sha256-XqWVrtHiY7r/NJMDS02i1kj3Q7BOU7BnfQfEd6v3ZIE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "98294130adb4c09ac5f66e83bf98d80b7853f1d3", "rev": "3c932dd06b0a537b890e1fd3e31deceb1ac3dea3",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
nixos/hosts/hades/nginx/configuration.nix
View file

@ -15,6 +15,8 @@ let
in { in {
imports = [ ]; imports = [ ];
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1t" ];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # 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 10.10.10.1/24;
allow 192.168.0.0/23; allow 192.168.0.0/23;
allow 80.60.83.220; allow 80.60.83.220;
allow 83.128.154.23;
allow 195.85.167.32/29; allow 195.85.167.32/29;
deny all; deny all;
''; '';
@ -99,7 +102,7 @@ in {
proxyWebsockets = true; proxyWebsockets = true;
}; };
locations."api/v1/streaming" = { locations."/api/v1/streaming" = {
proxyPass = "http://192.168.0.138:55000"; proxyPass = "http://192.168.0.138:55000";
proxyWebsockets = true; proxyWebsockets = true;
}; };

1
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -85,6 +85,7 @@ in {
allow 10.42.42.0/23; allow 10.42.42.0/23;
allow 192.168.0.0/23; allow 192.168.0.0/23;
allow 80.60.83.220; allow 80.60.83.220;
allow 83.128.154.23;
allow 195.85.167.32/29; allow 195.85.167.32/29;
deny all; deny all;
''; '';

2
nixos/hosts/olympus/wireguard/configuration.nix
View file

@ -77,7 +77,7 @@ in {
# https://docs.opnsense.org/manual/how-tos/wireguard-s2s.html # https://docs.opnsense.org/manual/how-tos/wireguard-s2s.html
publicKey = "KgqLhmUMX6kyTjRoa/GOCrZOvXNE5HWYuOr/T3v8/VI="; publicKey = "KgqLhmUMX6kyTjRoa/GOCrZOvXNE5HWYuOr/T3v8/VI=";
allowedIPs = [ "10.100.0.5/32" "192.168.0.0/23" "10.10.10.0/24" ]; 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; persistentKeepalive = 25;
} }
]; ];