Merge branch 'master' into mdBook

.gitignore

@@ -4,3 +4,4 @@
 result
 *.qcow2
 .direnv/
+book/

README.md

@@ -98,34 +98,3 @@ for documentation we currently just use README.md files.
 
 the devshell provides the python package ['grip'](https://github.com/joeyespo/grip) which can be used to preview different README.md files in the browser.
 the usage is simple, just run ```grip``` in the same folder as the README.md you wanna preview. then open your browser at ```http://localhost:6419 ```.
-
-## todos...
-
-#### infrastructure
-* [ ] host a local wiki with public available information about the space, for example:
-  * [ ] how to use coffe machine
-  * [ ] how to turn on/off electricity
-  * [ ] how to use beamer
-  * [ ] how to buecher ausleihen
-  * ...
-* [x] host some pad (codimd aka hedgedoc)
-* [ ] some network fileshare for storing the movies and streaming them within the network
-* [x] malobeo network infrastructure rework
-  * [x] request mulvad acc
-  * [x] remove freifunk, use openwrt with mulvad configured
-* [ ] evaluate imposing solutions
-    * [ ] pdfarranger
-
-#### external services
-we want to host two services that need a bit more resources, this is a booking system for the room itself and a library system.
-- [x] analyse best way to include our stuff into external nixOs server
-  - [x] writing some module that is included by the server
-  - [x] directly use nixOs container on host
-  - [x] combination of both (module that manages nginx blabla + nixOs container for the services
-
-#### bots&progrmaming
-* [ ] create telegram bot automatically posting tuesday events
-* [x] create webapp/interface replacing current task list pad
-  * could be a simple form for every tuesday
-  * [x] element bot should send updates if some tasks are not filled out
-

book.toml

@@ -0,0 +1,6 @@
+[book]
+authors = ["ahtlon"]
+language = "de"
+multilingual = false
+src = "src"
+title = "Malobeo Infrastruktur Dokumentation"

machines/lucia/configuration.nix

@@ -7,7 +7,6 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ../modules/malobeo_user.nix
-      ./file_server.nix
     ];
 
   sops.defaultSopsFile = ./secrets.yaml;

machines/lucia/file_server.nix

@@ -1,36 +0,0 @@
-{
-  #automount mit udisks2
-    #siehe udevadm monitor
-    #bash-script?
-    #user-oder root mount
-  #systemd-automount villeicht
-    fileSystems = {
-      "/mnt/extHdd0" = {               #statisches mounten ist am einfachsten aber kein hotplug möglich
-        device = "/dev/disk/by-uuid/"; #noch ausfüllen
-        fsType = "ext4";               #zfs wäre hier cool
-        options = [ "users" "nofail" ];
-      };
-      "/exports/extHdd0" = {
-        device = "/mnt/extHdd0";
-        fsType = "none";
-      };
-    };
-
-    users.groups = { nfs = {gid = 1003; }; }; #erstelle nfs user und gruppe für isolation
-    users.users.nfs = {
-      isSystemUser = true;
-      group = "nfs";
-      uid = 1003;
-    };
-    users.users.malobeo.extraGroups = [ "nfs" ];
-    
-    systemd.tmpfiles.rules = [ "d /export 0775 nfs nfs -" ]; #erstelle nfs ordner
-
-    services.nfs.server = {
-      enable = true;
-      exports = ''
-        /export 192.168.1.0/24(ro, nohide, no_subtree_check, async, all_squash, anonuid=1003, anongid=1003)
-      '';
-    };
-    networking.firewall.allowedTCPPorts = [ 2049 ]; #wir benutzen NfsV4 hoffentlich
-}

machines/modules/autoupdate.nix

@@ -100,12 +100,11 @@ in
     nix = {
       # Show a diff when activating a new system except for microvms which handle this seperately
       #diffSystem = config.malobeo.deployment.server or "" == "";
-      #TODO: THIS WIPES HOSTS NIX STORE FROM WITHIN NIXOS-CONTAINER
+      gc = lib.mkIf config.malobeo.autoUpdate.enable {
-      #gc = lib.mkIf config.malobeo.autoUpdate.enable {
+        automatic = true;
-      #  automatic = true;
+        randomizedDelaySec = "6h";
-      #  randomizedDelaySec = "6h";
+        options = "--delete-older-than 21d";
-      #  options = "--delete-older-than 21d";
+      };
-      #};
     };
 
     environment.systemPackages = [ (

shell.nix

@@ -18,5 +18,6 @@ mkShell {
     sops-init-gpg-key
     sops
     pkgs.python310Packages.grip
+    pkgs.mdbook
   ];
 }

src/Index.md

@@ -0,0 +1 @@
+# Index

src/SUMMARY.md

@@ -0,0 +1,15 @@
+# Summary
+
+- [Index](./Index.md)
+    - [Info]()
+        - [Aktuelle Server]()
+            - [Durruti](./server/durruti.md)
+            - [Lucia](./server/lucia.md)
+        - [Hardware]()
+        - [Netzwerk]()
+        - [Seiten]()
+            - [musik](./projekte/musik.md)
+        - [TODO](./todo.md)
+    - [How-to]()
+        - [Updates](./anleitung/updates.md)
+        - [Rollbacks](./anleitung/rollback.md)

src/anleitung/rollback.md

@@ -0,0 +1 @@
+# Rollbacks

src/anleitung/updates.md

@@ -0,0 +1 @@
+# Updates

src/projekte/musik.md

@@ -0,0 +1 @@
+# musik

src/server/durruti.md

@@ -0,0 +1 @@
+# Durruti

src/server/lucia.md

@@ -0,0 +1 @@
+# Lucia

src/todo.md

@@ -0,0 +1,29 @@
+# TODO
+- [ ] Dieses wiki schreiben
+#### infrastructure
+* [ ] host a local wiki with public available information about the space, for example:
+  * [ ] how to use coffe machine
+  * [ ] how to turn on/off electricity
+  * [ ] how to use beamer
+  * [ ] how to buecher ausleihen
+  * ...
+* [x] host some pad (codimd aka hedgedoc)
+* [ ] some network fileshare for storing the movies and streaming them within the network
+* [x] malobeo network infrastructure rework
+  * [x] request mulvad acc
+  * [x] remove freifunk, use openwrt with mulvad configured
+* [ ] evaluate imposing solutions
+    * [ ] pdfarranger
+
+#### external services
+we want to host two services that need a bit more resources, this is a booking system for the room itself and a library system.
+- [x] analyse best way to include our stuff into external nixOs server
+  - [x] writing some module that is included by the server
+  - [x] directly use nixOs container on host
+  - [x] combination of both (module that manages nginx blabla + nixOs container for the services
+
+#### bots&progrmaming
+* [ ] create telegram bot automatically posting tuesday events
+* [x] create webapp/interface replacing current task list pad
+  * could be a simple form for every tuesday
+  * [x] element bot should send updates if some tasks are not filled out