Compare commits
5 Commits
c20c620198
...
8a56607163
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a56607163 | |||
| 9b9f03fc20 | |||
| 0dbf41d54c | |||
| bded37656a | |||
| d579d0b86b |
38
flake.lock
generated
38
flake.lock
generated
@@ -50,11 +50,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744145203,
|
"lastModified": 1745224732,
|
||||||
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=",
|
"narHash": "sha256-0OWgbEKhpMLpk3WQi3ugOwxWW4Y6JVpKiQ+o0nuNzus=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989",
|
"rev": "1770bf1ae5da05564f86b969ef21c7228cc1a70b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -280,16 +280,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729958008,
|
"lastModified": 1737371634,
|
||||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
"narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "ixx",
|
"repo": "ixx",
|
||||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
"rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"ref": "v0.0.6",
|
"ref": "v0.0.7",
|
||||||
"repo": "ixx",
|
"repo": "ixx",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -301,11 +301,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744518957,
|
"lastModified": 1745120797,
|
||||||
"narHash": "sha256-RLBSWQfTL0v+7uyskC5kP6slLK1jvIuhaAh8QvB75m4=",
|
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "4fc9ea78c962904f4ea11046f3db37c62e8a02fd",
|
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -364,11 +364,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable_2": {
|
"nixpkgs-unstable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744463964,
|
"lastModified": 1744932701,
|
||||||
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
|
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
|
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -387,11 +387,11 @@
|
|||||||
"nuschtosSearch": "nuschtosSearch"
|
"nuschtosSearch": "nuschtosSearch"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744874965,
|
"lastModified": 1745244491,
|
||||||
"narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=",
|
"narHash": "sha256-UlwXkytxGW/aokB9fZ6cSznYKM9ynDLHqhjcPve0KL4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719",
|
"rev": "7a58109958d14bcece8ec3e2085e41ea3351e387",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -410,11 +410,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743683223,
|
"lastModified": 1745046075,
|
||||||
"narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=",
|
"narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "56a49ffef2908dad1e9a8adef1f18802bc760962",
|
"rev": "066afe8643274470f4a294442aadd988356a478f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -141,6 +141,15 @@
|
|||||||
.host = "100.64.229.126";
|
.host = "100.64.229.126";
|
||||||
.port = "10080";
|
.port = "10080";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub vcl_backend_response {
|
||||||
|
# default TTL if backend didn't specify one
|
||||||
|
if (beresp.ttl <= 0s) {
|
||||||
|
set beresp.ttl = 1h;
|
||||||
|
}
|
||||||
|
# serve stale content in case home link is down
|
||||||
|
set beresp.grace = 240h;
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
job "instasync" {
|
job "igsync" {
|
||||||
datacenters = ["alo"]
|
datacenters = ["alo"]
|
||||||
|
|
||||||
type = "batch"
|
type = "batch"
|
||||||
@@ -9,11 +9,6 @@ job "instasync" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group "cron" {
|
group "cron" {
|
||||||
volume "code" {
|
|
||||||
type = "host"
|
|
||||||
read_only = true
|
|
||||||
source = "code"
|
|
||||||
}
|
|
||||||
volume "nix-store" {
|
volume "nix-store" {
|
||||||
type = "host"
|
type = "host"
|
||||||
read_only = true
|
read_only = true
|
||||||
@@ -24,18 +19,24 @@ job "instasync" {
|
|||||||
read_only = true
|
read_only = true
|
||||||
source = "sw"
|
source = "sw"
|
||||||
}
|
}
|
||||||
|
volume "appdata" {
|
||||||
|
type = "host"
|
||||||
|
read_only = false
|
||||||
|
source = "appdata"
|
||||||
|
}
|
||||||
|
|
||||||
task "sync" {
|
task "sync" {
|
||||||
driver = "exec"
|
driver = "exec"
|
||||||
|
|
||||||
config {
|
config {
|
||||||
command = "/sw/bin/node"
|
command = "/appdata/igsync/run.sh"
|
||||||
args = ["/code/instasync/sync.js"]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
user = "ppetru"
|
||||||
|
|
||||||
volume_mount {
|
volume_mount {
|
||||||
volume = "code"
|
volume = "appdata"
|
||||||
destination = "/code"
|
destination = "/appdata"
|
||||||
}
|
}
|
||||||
volume_mount {
|
volume_mount {
|
||||||
volume = "nix-store"
|
volume = "nix-store"
|
||||||
@@ -47,7 +48,8 @@ job "instasync" {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resources {
|
resources {
|
||||||
memory = 100
|
memory = 1024
|
||||||
|
cpu = 2000
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ job "wiki" {
|
|||||||
port "captainslog" { }
|
port "captainslog" { }
|
||||||
port "alo" { }
|
port "alo" { }
|
||||||
port "pispace" { }
|
port "pispace" { }
|
||||||
|
port "grok" { }
|
||||||
}
|
}
|
||||||
|
|
||||||
task "captainslog" {
|
task "captainslog" {
|
||||||
@@ -168,5 +169,52 @@ job "wiki" {
|
|||||||
memory = 256
|
memory = 256
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task "grok" {
|
||||||
|
driver = "exec"
|
||||||
|
|
||||||
|
config {
|
||||||
|
command = "/sw/bin/node"
|
||||||
|
args = [
|
||||||
|
"/appdata/wiki/node_modules/tiddlywiki/tiddlywiki.js",
|
||||||
|
"/appdata/wiki/grok",
|
||||||
|
"--listen",
|
||||||
|
"host=0.0.0.0",
|
||||||
|
"port=${NOMAD_PORT_grok}",
|
||||||
|
"authenticated-user-header=X-authentik-username",
|
||||||
|
"readers=ppetru",
|
||||||
|
"writers=ppetru",
|
||||||
|
"admin=ppetru",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
volume_mount {
|
||||||
|
volume = "appdata"
|
||||||
|
destination = "/appdata"
|
||||||
|
}
|
||||||
|
volume_mount {
|
||||||
|
volume = "nix-store"
|
||||||
|
destination = "/nix/store"
|
||||||
|
}
|
||||||
|
volume_mount {
|
||||||
|
volume = "sw"
|
||||||
|
destination = "/sw"
|
||||||
|
}
|
||||||
|
|
||||||
|
service {
|
||||||
|
name = "groktw"
|
||||||
|
port = "grok"
|
||||||
|
tags = [
|
||||||
|
"traefik.enable=true",
|
||||||
|
"traefik.http.routers.groktw.entryPoints=websecure",
|
||||||
|
"traefik.http.routers.groktw.middlewares=authentik@file",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
resources {
|
||||||
|
cpu = 500
|
||||||
|
memory = 256
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user