Skip to content

Commit 8f29e90

Browse files
committed
Update deps
1 parent ce27df3 commit 8f29e90

6 files changed

Lines changed: 90 additions & 144 deletions

File tree

flake.lock

Lines changed: 76 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@
2626
};
2727
nixos-facter-modules.url = "github:nix-community/nixos-facter-modules";
2828
# Colmena unstable
29-
colmena = {
30-
url = "github:zhaofengli/colmena";
31-
inputs.nixpkgs.follows = "nixpkgs";
32-
};
29+
colmena.url = "github:zhaofengli/colmena";
3330
# Sops-nix
3431
sops-nix = {
3532
url = "github:Mic92/sops-nix";
@@ -53,15 +50,8 @@
5350
url = "github:nix-community/nixos-images";
5451
# Nixpkgs inputs deliberately not ignored to avoid rebuilds and use the cache instead
5552
};
56-
# External services run on our infra
57-
backend-legacy = {
58-
url = "github:Polyfrost/backend/main";
59-
inputs = {
60-
nixpkgs.follows = "nixpkgs";
61-
flake-utils.follows = "flake-utils";
62-
};
63-
};
64-
backend-v1 = {
53+
# Services run on our infra
54+
backend = {
6555
url = "github:Polyfrost/backend/v1";
6656
inputs = {
6757
nixpkgs.follows = "nixpkgs";

nixos/hosts/vps/config/services/backend/container.nix

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,15 @@
66
...
77
}:
88
{
9-
systemd.services = {
10-
backend-legacy = {
11-
wantedBy = [ "multi-user.target" ];
9+
systemd.services.backend-v1 = {
10+
wantedBy = [ "multi-user.target" ];
1211

13-
environment = {
14-
PORT = "8080";
15-
PUBLIC_MAVEN_URL = "https://repo.polyfrost.org";
16-
INTERNAL_MAVEN_URL = "http://[${ips.v6.containers.reposilite}]:8080";
17-
};
18-
19-
serviceConfig.ExecStart = [ "${lib.getExe inputs.backend-legacy.packages.${system}.default}" ];
12+
environment = {
13+
BACKEND_BIND_ADDRS = "[::]:8080";
14+
BACKEND_PUBLIC_MAVEN_URL = "https://repo.polyfrost.org";
15+
BACKEND_INTERNAL_MAVEN_URL = "http://[${ips.v6.containers.reposilite}]:8080";
2016
};
21-
backend-v1 = {
22-
wantedBy = [ "multi-user.target" ];
23-
24-
environment = {
25-
BACKEND_BIND_ADDRS = "[::]:8081";
26-
BACKEND_PUBLIC_MAVEN_URL = "https://repo.polyfrost.org";
27-
BACKEND_INTERNAL_MAVEN_URL = "http://[${ips.v6.containers.reposilite}]:8080";
28-
};
2917

30-
serviceConfig.ExecStart = [ "${lib.getExe inputs.backend-v1.packages.${system}.default}" ];
31-
};
18+
serviceConfig.ExecStart = [ "${lib.getExe inputs.backend.packages.${system}.default}" ];
3219
};
3320
}

0 commit comments

Comments
 (0)