Merge remote-tracking branch 'refs/remotes/origin/main'
This commit is contained in:
commit
937887a6a8
12
flake.lock
12
flake.lock
|
@ -325,11 +325,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734323986,
|
"lastModified": 1734600368,
|
||||||
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
|
"narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
|
"rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -459,11 +459,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734543842,
|
"lastModified": 1734704479,
|
||||||
"narHash": "sha256-/QceWozrNg915Db9x/Ie5k67n9wKgGdTFng+Z1Qw0kE=",
|
"narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "76159fc74eeac0599c3618e3601ac2b980a29263",
|
"rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,116 +1,115 @@
|
||||||
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
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
|
|
||||||
pkgs.stdenv.mkDerivation rec {
|
pkgs.stdenv.mkDerivation rec {
|
||||||
pname = "duplicacy-web";
|
pname = "duplicacy-web";
|
||||||
version = "1.8.0";
|
version = "1.8.3";
|
||||||
|
|
||||||
src = builtins.fetchurl {
|
src = builtins.fetchurl {
|
||||||
url = "https://acrosync.com/${pname}/duplicacy_web_linux_x64_${version}";
|
url = "https://acrosync.com/${pname}/duplicacy_web_linux_x64_${version}";
|
||||||
sha256 = "f0b4d4c16781a6ccb137f161df9de86574e7a55660c582682c63062e26476c4a";
|
sha256 = "9cdcaa875ae5fc0fcf93941df3a5133fb3c3ff92c89f87babddc511ba6dd7ef8";
|
||||||
};
|
};
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
|
@ -35,7 +35,7 @@ let
|
||||||
x: x != "acme" && (lib.attrsets.matchAttrs { enable = true; } x)
|
x: x != "acme" && (lib.attrsets.matchAttrs { enable = true; } x)
|
||||||
) config.${namespace}.services;
|
) config.${namespace}.services;
|
||||||
subdomains = (builtins.catAttrs "url" serviceList) ++ [
|
subdomains = (builtins.catAttrs "url" serviceList) ++ [
|
||||||
config.${namespace}.secrets.services.gremlin-lab.url
|
config.${namespace}.secrets.hosts.gremlin-lab.URI
|
||||||
];
|
];
|
||||||
|
|
||||||
in
|
in
|
||||||
|
@ -229,11 +229,11 @@ in
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
root = "${services-root}/nginx/sites/${config.${namespace}.secrets.networking.domains.blog}";
|
root = "${services-root}/nginx/sites/${config.${namespace}.secrets.networking.domains.blog}";
|
||||||
};
|
};
|
||||||
"${config.${namespace}.secrets.services.gremlin-lab.url}" = {
|
"${config.${namespace}.secrets.hosts.gremlin-lab.URI}" = {
|
||||||
useACMEHost = config.${namespace}.secrets.networking.domains.primary;
|
useACMEHost = config.${namespace}.secrets.networking.domains.primary;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://${config.${namespace}.secrets.services.gremlin-lab.ip}";
|
proxyPass = "http://${config.${namespace}.secrets.hosts.gremlin-lab.IP}";
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
extraConfig = "proxy_ssl_server_name on;";
|
extraConfig = "proxy_ssl_server_name on;";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue