fix atticd
This commit is contained in:
parent
e33509491c
commit
11fc735d23
4 changed files with 8 additions and 16 deletions
|
|
@ -10,7 +10,7 @@
|
||||||
services.nextcloud.enable = true;
|
services.nextcloud.enable = true;
|
||||||
services.hydra.enable = true;
|
services.hydra.enable = true;
|
||||||
# services.caddy.enable = true;
|
# services.caddy.enable = true;
|
||||||
services.attic.enable = true;
|
services.atticd.enable = true;
|
||||||
services.cloudflared.enable = true;
|
services.cloudflared.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@
|
||||||
ollama.enable = lib.mkEnableOption "ollama";
|
ollama.enable = lib.mkEnableOption "ollama";
|
||||||
forgejo.enable = lib.mkEnableOption "forgejo";
|
forgejo.enable = lib.mkEnableOption "forgejo";
|
||||||
caddy.enable = lib.mkEnableOption "caddy";
|
caddy.enable = lib.mkEnableOption "caddy";
|
||||||
attic.enable = lib.mkEnableOption "attic";
|
atticd.enable = lib.mkEnableOption "atticd";
|
||||||
cloudflared.enable = lib.mkEnableOption "cloudflared";
|
cloudflared.enable = lib.mkEnableOption "cloudflared";
|
||||||
cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns";
|
cloudflare-dyndns.enable = lib.mkEnableOption "cloudflare-dyndns";
|
||||||
glance.enable = lib.mkEnableOption "glance";
|
glance.enable = lib.mkEnableOption "glance";
|
||||||
|
|
|
||||||
|
|
@ -4,24 +4,16 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
atticPort = 7080;
|
atticdPort = 7080;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options = {
|
|
||||||
osbmModules.enableAttic = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable Attic nix cache service";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkMerge [
|
config = lib.mkMerge [
|
||||||
(lib.mkIf config.osbmModules.enableAttic {
|
(lib.mkIf config.osbmModules.services.atticd.enable {
|
||||||
services.atticd = {
|
services.atticd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environmentFile = "/persist/attic.env";
|
environmentFile = "/persist/attic.env";
|
||||||
settings = {
|
settings = {
|
||||||
listen = "[::]:${toString atticPort}";
|
listen = "[::]:${toString atticdPort}";
|
||||||
compression = {
|
compression = {
|
||||||
type = "zstd";
|
type = "zstd";
|
||||||
level = 9;
|
level = 9;
|
||||||
|
|
@ -34,14 +26,14 @@ in
|
||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.allowedTCPPorts = [ atticPort ];
|
networking.firewall.allowedTCPPorts = [ atticdPort ];
|
||||||
services.cloudflared.tunnels = {
|
services.cloudflared.tunnels = {
|
||||||
"fa301a21-b259-4149-b3d0-b1438c7c81f8" = {
|
"fa301a21-b259-4149-b3d0-b1438c7c81f8" = {
|
||||||
default = "http_status:404";
|
default = "http_status:404";
|
||||||
credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json";
|
credentialsFile = "/home/osbm/.cloudflared/fa301a21-b259-4149-b3d0-b1438c7c81f8.json";
|
||||||
ingress = {
|
ingress = {
|
||||||
"cache.osbm.dev" = {
|
"cache.osbm.dev" = {
|
||||||
service = "http://localhost:${toString atticPort}";
|
service = "http://localhost:${toString atticdPort}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./attic.nix
|
./atticd.nix
|
||||||
./caddy.nix
|
./caddy.nix
|
||||||
./cloudflare-dyndns.nix
|
./cloudflare-dyndns.nix
|
||||||
./cloudflared.nix
|
./cloudflared.nix
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue