27 Commits

Author SHA1 Message Date
9a3135d339 [readme] rm durruti ip
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 2m57s
2024-11-21 16:19:03 +01:00
054076e683 Merge remote-tracking branch 'origin' into documentation
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 3m20s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 3m51s
2024-11-21 16:09:04 +01:00
d212728676 [microvm] differentiate between stable and unstable nixpkgs
Some checks failed
Evaluate Hydra Jobs / eval-hydra-jobs (push) Has been cancelled
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Failing after 14m32s
2024-11-21 16:07:42 +01:00
28bf68098c [microvm] Fix conditionals within module
finally i hope....
2024-11-21 16:07:42 +01:00
2961a96860 [microvm] mv mkIf down one layer 2024-11-21 16:07:42 +01:00
7d825731bd [docs] update microvm docu 2024-11-21 16:07:42 +01:00
3fe5b8da20 [microvm] separate enableHostBridge from deployHosts 2024-11-21 16:07:42 +01:00
1bafdec4ab [microvm] fix errors within module
still checking if list is empty does not work as expected -.-
2024-11-21 16:07:42 +01:00
7b1bce6dc8 [microvm] fix type 2024-11-21 16:07:42 +01:00
02c1e307ed [microvm] fix comparision 2024-11-21 16:07:42 +01:00
26cc4b245e [microvm] add microvm deployment option to host 2024-11-21 16:07:42 +01:00
d6d449d1d8 [doc] add basic microvm documentation 2024-11-21 16:07:42 +01:00
af881b8996 [docs] fix docs app exec format error 2024-11-21 16:07:42 +01:00
370d975dbb [durruti] add docs.malobeo.org to host_config
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 4m7s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 4m7s
2024-11-19 15:23:07 +01:00
048e0653a5 [durruti] serve docs on port 9000
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 2m45s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 3m35s
2024-11-19 15:17:28 +01:00
b9cddb0bae [microvm] share read only nix store
this reduces build times drastically
2024-11-19 15:10:13 +01:00
05087d9fa6 [durruti] WIP add documentation.nix 2024-11-19 14:11:54 +01:00
ahtlon
47d386d81a Fix docs about updating keys 2024-11-19 14:11:54 +01:00
ahtlon
3f469c09f0 Add documentation describing how to add keys to sops 2024-11-19 14:11:54 +01:00
65f9fda381 [sops] updatekeys for ahtlon 2024-11-19 14:11:54 +01:00
ahtlon
73e3742af5 Add atlan's sops and ssh pubkeys 2024-11-19 14:11:54 +01:00
63c36f6add [microvm] put vm creation into function
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 3m14s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 3m44s
2024-11-19 13:31:09 +01:00
be194e4293 [microvm] rm duplicate option
Some checks failed
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 2m39s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Failing after 13m12s
2024-11-19 13:03:47 +01:00
edb9dcb28b [microvm] split module files
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 4m0s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 4m10s
2024-11-19 12:59:11 +01:00
05ec7004ad [microvm] setup network, allow adding bridge interface to host
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 3m19s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 3m20s
2024-11-18 22:55:03 +01:00
d1afbe9f14 [durruti] make durruti microvm
All checks were successful
Evaluate Hydra Jobs / eval-hydra-jobs (push) Successful in 3m18s
Evaluate Hydra Jobs / eval-hydra-jobs (pull_request) Successful in 2m56s
Networking still needs to be done but the vm boots using ```nix run .\#nixosConfigurations.durruti.config.microvm.declaredRunner```
2024-11-14 14:37:02 +01:00
807d2007fa [nixpkgs] add microvm.nix 2024-11-14 14:36:32 +01:00
6 changed files with 27 additions and 1 deletions

View File

@@ -8,7 +8,7 @@ the file structure is based on this [blog post](https://samleathers.com/posts/20
#### durruti #### durruti
- nixos-container running on dedicated hetzner server - nixos-container running on dedicated hetzner server
- login via ```ssh -p 222 malobeo@5.9.153.217``` - login via ```ssh -p 222 malobeo@dynamicdiscord.de```
- if rebuild switch fails due to biglock do ```mount -o remount,rw /nix/var/nix/db``` - if rebuild switch fails due to biglock do ```mount -o remount,rw /nix/var/nix/db```
- currently is running tasklist in detached tmux session - currently is running tasklist in detached tmux session
- [x] make module with systemd service out of that - [x] make module with systemd service out of that

View File

@@ -86,6 +86,7 @@ in
durruti = nixosSystem { durruti = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.inputs = inputs; specialArgs.inputs = inputs;
specialArgs.self = self;
modules = makeMicroVM "durruti" "10.0.0.5" [ modules = makeMicroVM "durruti" "10.0.0.5" [
./durruti/configuration.nix ./durruti/configuration.nix
]; ];

View File

@@ -22,6 +22,9 @@ with lib;
imports = [ imports = [
inputs.ep3-bs.nixosModules.ep3-bs inputs.ep3-bs.nixosModules.ep3-bs
inputs.tasklist.nixosModules.malobeo-tasklist inputs.tasklist.nixosModules.malobeo-tasklist
./documentation.nix
../modules/malobeo_user.nix ../modules/malobeo_user.nix
../modules/sshd.nix ../modules/sshd.nix
../modules/minimal_tools.nix ../modules/minimal_tools.nix

View File

@@ -0,0 +1,15 @@
{ config, self, ... }:
{
services.nginx = {
enable = true;
virtualHosts."_" = {
listen = [
{ addr = "0.0.0.0"; port = 9000; }
];
root = "${self.packages.x86_64-linux.docs}/share/doc";
};
};
networking.firewall.allowedTCPPorts = [ 9000 ];
}

View File

@@ -33,6 +33,12 @@ in
} }
]; ];
services.nginx.virtualHosts."docs.malobeo.org" = {
forceSSL = true;
enableACME= true;
locations."/".proxyPass = "http://${cfg.host_ip}:9000";
};
services.nginx.virtualHosts."tasklist.malobeo.org" = { services.nginx.virtualHosts."tasklist.malobeo.org" = {
forceSSL = true; forceSSL = true;
enableACME= true; enableACME= true;

View File

@@ -50,6 +50,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
})) // rec { })) // rec {
nixosConfigurations = import ./machines/configuration.nix (inputs // { nixosConfigurations = import ./machines/configuration.nix (inputs // {
inherit inputs; inherit inputs;
self = self;
}); });
nixosModules.malobeo.imports = [ nixosModules.malobeo.imports = [