nix-serve -> harmonia
This commit is contained in:
parent
b1c4f375c1
commit
c984843694
5 changed files with 23 additions and 18 deletions
|
@ -180,9 +180,22 @@ in
|
||||||
host = "mastodon.${domain}";
|
host = "mastodon.${domain}";
|
||||||
accessType = "none";
|
accessType = "none";
|
||||||
};
|
};
|
||||||
nix_cache_host = {
|
nix_cache_host = rec {
|
||||||
host = "nixcache.${domain}";
|
host = "nixcache.${domain}";
|
||||||
port = 5000;
|
port = 5000;
|
||||||
|
# accessType = "custom";
|
||||||
|
# extraNginx.locations."/".extraConfig = ''
|
||||||
|
# proxy_pass http://127.0.0.1:${builtins.toString port};
|
||||||
|
# proxy_set_header Host $host;
|
||||||
|
# proxy_redirect http:// https://;
|
||||||
|
# proxy_http_version 1.1;
|
||||||
|
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
# proxy_set_header Upgrade $http_upgrade;
|
||||||
|
# proxy_set_header Connection $connection_upgrade;
|
||||||
|
#
|
||||||
|
# zstd on;
|
||||||
|
# zstd_types application/x-nix-archive;
|
||||||
|
# '';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,9 +9,9 @@ let
|
||||||
inherit (config.serverConfig) ports vhosts;
|
inherit (config.serverConfig) ports vhosts;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.nix-serve = {
|
services.harmonia = {
|
||||||
enable = true;
|
enable = true;
|
||||||
secretKeyFile = "/var/cache-priv-key.pem";
|
signKeyPath = "/var/cache-priv-key.pem";
|
||||||
port = vhosts.nix_cache_host.port;
|
settings.bind = "[::]:${builtins.toString vhosts.nix_cache_host.port}";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
"homepage": "https://matrix.to/#/#agenix:nixos.org",
|
"homepage": "https://matrix.to/#/#agenix:nixos.org",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "07479c2e7396acaaaac5925483498154034ea80a",
|
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
|
||||||
"sha256": "0vnxjsg080la54klxm97iiqwscf9brbqcrys5zw0czjk05anxkky",
|
"sha256": "0z26jj4pwliz6v5fdgnwc5fsihjdsy2gz49fcivr4p4178fw4gnr",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/ryantm/agenix/archive/07479c2e7396acaaaac5925483498154034ea80a.tar.gz",
|
"url": "https://github.com/ryantm/agenix/archive/8d37c5bdeade12b6479c85acd133063ab53187a0.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"chaotic": {
|
"chaotic": {
|
||||||
|
@ -59,10 +59,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
|
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
|
||||||
"sha256": "1506hd482n7qb55niqjx4789swjrqyng21xvzfwagq1nr173kd88",
|
"sha256": "0khh2y04wp4dy1hy0nxc4raacp8149ds7mpwmnymf55v7xzf10vn",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/b211b392b8486ee79df6cdfb1157ad2133427a29.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/f1010e0469db743d14519a1efd37e23f8513d714.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
./matrix-appservice-discord.nix
|
./matrix-appservice-discord.nix
|
||||||
./deskwhich.nix
|
./deskwhich.nix
|
||||||
./mcontrolcenter.nix
|
./mcontrolcenter.nix
|
||||||
./the-powder-toy.nix
|
|
||||||
./ccache-wrapper.nix
|
./ccache-wrapper.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{ final, prev, ... }:
|
|
||||||
{
|
|
||||||
the-powder-toy = prev.callPackage (prev.fetchurl {
|
|
||||||
url = "https://raw.githubusercontent.com/NixOS/nixpkgs/9863d8c74a959d73df0c495a55097f804f7b379d/pkgs/by-name/th/the-powder-toy/package.nix";
|
|
||||||
hash = "sha256-po6jhmdV+HNZBq4/vy6uQsDuW6PyvKcvysWNPZn4K7I=";
|
|
||||||
}) { };
|
|
||||||
}
|
|
Loading…
Reference in a new issue