Compare commits

..
5 Commits
Author SHA1 Message Date
kalipso 44cbc96e0d [scripts] init malobeo ssh commands
Check flake syntax / flake-check (push) Successful in 7m26s
Hydra callback / on_push (pull_request) Skipped
Hydra callback / on_pr (pull_request) Successful in 8m32s
they are not yet working, its just placeholders
2026-11-03 18:16:06 +01: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
6 changed files with 70 additions and 11 deletions
Generated
+4 -4
View File
@@ -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"
},
+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;
+6
View File
@@ -264,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;
+17 -6
View File
@@ -47,12 +47,18 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
shellHook = ''echo "Available scripts: ${builtins.concatStringsSep " " installed}"'';
};
legacyPackages = {
scripts.remote-install = pkgs.writeShellScriptBin "remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
scripts.boot-unlock = pkgs.writeShellScriptBin "boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
scripts.add-host-keys = pkgs.writeShellScriptBin "add-host-keys" (builtins.readFile ./scripts/add_new_host_keys.sh);
scripts.run-vm = self.packages.${system}.run-vm;
};
legacyPackages.scripts = {
malobeo-remote-install = pkgs.writeShellScriptBin "malobeo-remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
malobeo-boot-unlock = pkgs.writeShellScriptBin "malobeo-boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
malobeo-add-host-keys = pkgs.writeShellScriptBin "malobeo-add-host-keys" (builtins.readFile ./scripts/add_new_host_keys.sh);
malobeo-run-vm = self.packages.${system}.run-vm;
} // (import ./packages/ssh_to_hosts.nix) {
malobeo = (import ./machines/hosts.nix {}).malobeo;
peers = import ./machines/modules/malobeo/peers.nix;
pkgs = pkgs;
lib = nixpkgs.lib;
};
vmBuilder = utils.buildVM;
@@ -75,6 +81,11 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
};
run-vm = pkgs.writeShellScriptBin "run-vm" (builtins.readFile ./scripts/run-vm.sh);
} // (import ./packages/ssh_to_hosts.nix) {
malobeo = (import ./machines/hosts.nix {}).malobeo;
peers = import ./machines/modules/malobeo/peers.nix;
pkgs = pkgs;
lib = nixpkgs.lib;
};
apps = {
+35
View File
@@ -0,0 +1,35 @@
{ malobeo, peers, pkgs, lib, ... }:
#mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value))
let
get_ip = hostname: malobeo.hosts.${hostname}.network.address;
generate_ssh_command = hostname: hostConfig: (
if hostConfig.network.local == true then
if hostname == "fanny" then
"ssh admin@${malobeo.hosts."fanny".network.address}"
else
"ssh -J admin@${malobeo.hosts."fanny".network.address} admin@${get_ip hostname}"
else
"offsite"
);
in
(lib.attrsets.mapAttrs' (hostname: hostConfig: lib.nameValuePair
("malobeo-ssh-${hostname}")
(pkgs.writeShellScriptBin "malobeo-ssh-${hostname}"
''
#!/bin/sh
echo "${hostname} ${generate_ssh_command hostname hostConfig}"
'')) malobeo.hosts )
#{
# test-pkg = pkgs.writeShellScriptBin "run-vm" (builtins.readFile ../scripts/run-vm.sh);
#}
# microvm
# - local:
# - yes: ssh through fanny
# - no: if in peers.nix -> ssh through vpn, else not possible
# not microvm:
# - local:
# - yes: ssh through fanny (except for fanny)
# - no: not supported