Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
44cbc96e0d | ||
|
|
70f0812a8e | ||
|
|
277caf6375 | ||
|
|
e059576114 | ||
|
|
b6d7030967 |
Generated
+4
-4
@@ -568,11 +568,11 @@
|
|||||||
"utils": "utils_4"
|
"utils": "utils_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789131197,
|
"lastModified": 1792488750,
|
||||||
"narHash": "sha256-gpjhy2mIBt89oCVzoSXy8AgfAKjJ9Fi3u01CX09UTF4=",
|
"narHash": "sha256-VLBpNctawQ+Yd03hkfhNPUqQVXNCc7bc6Qhu7mwJvKM=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "38bcceb0e8b84d6dcd50d05683c71eea8d410479",
|
"rev": "7a8b9d4f3522c68cd15b21a1ec093c8c441775bf",
|
||||||
"revCount": 161,
|
"revCount": 162,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.dynamicdiscord.de/kalipso/zineshop"
|
"url": "https://git.dynamicdiscord.de/kalipso/zineshop"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -263,7 +263,7 @@ in
|
|||||||
client_body_in_file_only clean;
|
client_body_in_file_only clean;
|
||||||
client_body_buffer_size 32K;
|
client_body_buffer_size 32K;
|
||||||
|
|
||||||
client_max_body_size 50M;
|
client_max_body_size 500M;
|
||||||
|
|
||||||
sendfile on;
|
sendfile on;
|
||||||
send_timeout 300s;
|
send_timeout 300s;
|
||||||
|
|||||||
@@ -264,6 +264,12 @@ in
|
|||||||
targets = [ "${hosts.malobeo.hosts.albert.network.address}:9002" ];
|
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
|
# add vpn - check how to reach it first. most probably 10.100.0.1
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,10 +23,17 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
inputs.malobeo.nixosModules.malobeo.metrics
|
||||||
inputs.self.nixosModules.malobeo.users
|
inputs.self.nixosModules.malobeo.users
|
||||||
../modules/sshd.nix
|
../modules/sshd.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
malobeo.metrics = {
|
||||||
|
enable = true;
|
||||||
|
enablePromtail = true;
|
||||||
|
logNginx = true;
|
||||||
|
};
|
||||||
|
|
||||||
malobeo.users = {
|
malobeo.users = {
|
||||||
malobeo = false;
|
malobeo = false;
|
||||||
admin = true;
|
admin = true;
|
||||||
|
|||||||
+17
-6
@@ -47,12 +47,18 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
|
|||||||
shellHook = ''echo "Available scripts: ${builtins.concatStringsSep " " installed}"'';
|
shellHook = ''echo "Available scripts: ${builtins.concatStringsSep " " installed}"'';
|
||||||
};
|
};
|
||||||
|
|
||||||
legacyPackages = {
|
legacyPackages.scripts = {
|
||||||
scripts.remote-install = pkgs.writeShellScriptBin "remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
|
malobeo-remote-install = pkgs.writeShellScriptBin "malobeo-remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
|
||||||
scripts.boot-unlock = pkgs.writeShellScriptBin "boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
|
malobeo-boot-unlock = pkgs.writeShellScriptBin "malobeo-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);
|
malobeo-add-host-keys = pkgs.writeShellScriptBin "malobeo-add-host-keys" (builtins.readFile ./scripts/add_new_host_keys.sh);
|
||||||
scripts.run-vm = self.packages.${system}.run-vm;
|
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;
|
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);
|
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 = {
|
apps = {
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
Reference in New Issue
Block a user