Compare commits

...
Author SHA1 Message Date
kalipso 88f7da1700 [nixpkgs] update
Check flake syntax / flake-check (push) Successful in 5m9s
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Successful in 1h16m46s
2026-10-22 10:42:04 +02:00
kalipso 70f0812a8e Merge pull request 'wordpress: enable metrics' (#203) from wordpress_metrics into master
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 5m29s
2026-10-21 17:32:43 +02:00
kalipso 277caf6375 [wordpress] enable metrics
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Successful in 2m28s
Check flake syntax / flake-check (push) Successful in 22m19s
2026-10-21 12:29:50 +02:00
kalipso e059576114 [zineshop] update
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 10m29s
2026-10-20 11:32:51 +02:00
kalipso b6d7030967 [zineshop] increase local upload limit to 500mb
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 13m21s
2026-10-20 11:27:52 +02:00
ahtlon d79e68fc0e [gitea_translater] add /health and monitor on overwatch
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Successful in 7m17s
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 26m23s
2026-10-16 21:22:25 +02:00
ahtlon 88ddae75e0 [albert] fix #192
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 15m24s
2026-10-13 22:00:22 +02:00
ahtlon a0e664f4f5 [fanny] fix dyndns
Hydra callback / on_pr (push) Skipped
Hydra callback / on_push (push) Skipped
Check flake syntax / flake-check (push) Successful in 30m34s
2026-10-13 17:53:07 +02:00
8 changed files with 39 additions and 15 deletions
Generated
+7 -7
View File
@@ -264,11 +264,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1788187754,
"narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
"lastModified": 1792615934,
"narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
"rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
"type": "github"
},
"original": {
@@ -568,11 +568,11 @@
"utils": "utils_4"
},
"locked": {
"lastModified": 1789131197,
"narHash": "sha256-gpjhy2mIBt89oCVzoSXy8AgfAKjJ9Fi3u01CX09UTF4=",
"lastModified": 1792488750,
"narHash": "sha256-VLBpNctawQ+Yd03hkfhNPUqQVXNCc7bc6Qhu7mwJvKM=",
"ref": "refs/heads/master",
"rev": "38bcceb0e8b84d6dcd50d05683c71eea8d410479",
"revCount": 161,
"rev": "7a8b9d4f3522c68cd15b21a1ec093c8c441775bf",
"revCount": 162,
"type": "git",
"url": "https://git.dynamicdiscord.de/kalipso/zineshop"
},
+5
View File
@@ -86,6 +86,11 @@ in
};
};
systemd.network.networks."05-unmanaged-docker" = {
matchConfig = { Name = "veth*"; Kind = "veth"; };
linkConfig = { Unmanaged = true; };
};
nixpkgs.config.allowUnfree = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" "i686-linux" ];
services.acpid.enable = true;
+1
View File
@@ -20,6 +20,7 @@
services.malobeo.gitea-translator = {
enable = true;
host = "0.0.0.0";
};
services.hydra = {
+1 -1
View File
@@ -263,7 +263,7 @@ in
client_body_in_file_only clean;
client_body_buffer_size 32K;
client_max_body_size 50M;
client_max_body_size 500M;
sendfile on;
send_timeout 300s;
+1 -6
View File
@@ -1,17 +1,12 @@
{pkgs, ...}:
{
sops.secrets.njalacloud = {};
sops.secrets.njalazines = {};
sops.secrets.njalaantamap = {};
sops.secrets.njalarm16 = {};
systemd.services."dyndns" = {
script = ''
KEYCLOUD=$(cat /run/secrets/njalacloud)
KEYZINES=$(cat /run/secrets/njalazines)
KEYANATAMAP=$(cat /run/secrets/njalaantamap)
KEYRM16=$(cat /run/secrets/njalarm16)
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=cloud.malobeo.org&k="$KEYCLOUD"&auto"
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=zines.malobeo.org&k="$KEYZINES"&auto"
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=antamap.malobeo.org&k="$KEYANATAMAP"&auto"
${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=rm16bleibt.org&k="$KEYRM16"&auto"
'';
serviceConfig = {
+7
View File
@@ -145,6 +145,7 @@ in
"https://keys.malobeo.org"
"https://tasklist.malobeo.org"
"https://zines.malobeo.org"
"http://${hosts.malobeo.hosts.albert.network.address}:27364/health"
];
}];
@@ -263,6 +264,12 @@ in
targets = [ "${hosts.malobeo.hosts.albert.network.address}:9002" ];
}];
}
{
job_name = "wordpress";
static_configs = [{
targets = [ "${hosts.malobeo.hosts.wordpress.network.address}:9002" ];
}];
}
# add vpn - check how to reach it first. most probably 10.100.0.1
];
};
+7
View File
@@ -23,10 +23,17 @@ in {
};
imports = [
inputs.malobeo.nixosModules.malobeo.metrics
inputs.self.nixosModules.malobeo.users
../modules/sshd.nix
];
malobeo.metrics = {
enable = true;
enablePromtail = true;
logNginx = true;
};
malobeo.users = {
malobeo = false;
admin = true;
+10 -1
View File
@@ -26,7 +26,7 @@ def _parse_response(baseurl, owner, repo):
return pulls
class PullsHandler(BaseHTTPRequestHandler):
_VALID_PATHS={"/", "/gitea-pulls-sorted.json"}
_VALID_PATHS={"/", "/gitea-pulls-sorted.json", "/health"}
# Class variables to store configuration
baseurl = None
@@ -34,6 +34,15 @@ class PullsHandler(BaseHTTPRequestHandler):
repo = None
def do_GET(self):
if self.path == "/health":
body=json.dumps({"status": "ok"}).encode("utf-8")
self.send_response(200)
self.send_header("Content-Type", "application/json; charset=utf-8")
self.send_header("Content-Length", str(len(body)))
self.end_headers()
self.wfile.write(body)
return
if self.path not in self._VALID_PATHS:
self.send_error(404, "Not Found")
return