From c3b1a294aecb73aee94033a54bcd15e1a9368911 Mon Sep 17 00:00:00 2001 From: coolneng Date: Sat, 14 Jan 2023 20:00:15 +0100 Subject: [PATCH] Update openbooks container --- modules/hardware-configuration.nix | 85 ++++++++++++++++-------------- modules/information.nix | 4 +- modules/webstack.nix | 1 + 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix index a3b23e3..c43e154 100644 --- a/modules/hardware-configuration.nix +++ b/modules/hardware-configuration.nix @@ -28,58 +28,33 @@ fsType = "zfs"; }; - fileSystems."/var/lib/matrix-as-facebook" = - { device = "vault/state_directories/matrix-as-facebook"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/gitea" = - { device = "vault/state_directories/gitea"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/signald" = - { device = "vault/state_directories/signald"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/containers" = - { device = "vault/containers"; - fsType = "zfs"; - }; - - fileSystems."/var/lib/matrix-as-telegram" = - { device = "vault/state_directories/matrix-as-telegram"; - fsType = "zfs"; - }; - fileSystems."/var/lib/wallabag" = { device = "vault/state_directories/wallabag"; fsType = "zfs"; }; + fileSystems."/var/lib/matrix-as-facebook" = + { device = "vault/state_directories/matrix-as-facebook"; + fsType = "zfs"; + }; + fileSystems."/var/lib/matrix-as-signal" = { device = "vault/state_directories/matrix-as-signal"; fsType = "zfs"; }; - fileSystems."/vault/git" = - { device = "vault/git"; + fileSystems."/var/lib/gitea" = + { device = "vault/state_directories/gitea"; fsType = "zfs"; }; - fileSystems."/vault/radicale" = - { device = "vault/radicale"; + fileSystems."/var/lib/containers" = + { device = "vault/containers"; fsType = "zfs"; }; - fileSystems."/vault/nextcloud" = - { device = "vault/nextcloud"; - fsType = "zfs"; - }; - - fileSystems."/vault/backups" = - { device = "vault/backups"; + fileSystems."/var/lib/signald" = + { device = "vault/state_directories/signald"; fsType = "zfs"; }; @@ -88,11 +63,36 @@ fsType = "zfs"; }; + fileSystems."/vault/git" = + { device = "vault/git"; + fsType = "zfs"; + }; + + fileSystems."/vault/nextcloud" = + { device = "vault/nextcloud"; + fsType = "zfs"; + }; + + fileSystems."/vault/radicale" = + { device = "vault/radicale"; + fsType = "zfs"; + }; + + fileSystems."/vault/backups" = + { device = "vault/backups"; + fsType = "zfs"; + }; + fileSystems."/var/lib/containers/storage/zfs-containers/1996d0540bceeb3dea027b3e5ef9e6cd94ea527ce657bf6461286d7b4afa637f/userdata/shm" = { device = "shm"; fsType = "tmpfs"; }; + fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = + { device = "shm"; + fsType = "tmpfs"; + }; + fileSystems."/vault/backups/zion" = { device = "vault/backups/zion"; fsType = "zfs"; @@ -108,13 +108,18 @@ fsType = "zfs"; }; - fileSystems."/var/lib/containers/storage/zfs-containers/737d2ce2ce884a2dffe6640ad1e0ea8fe2cf0a200f13a9490bb7f89bb19940cb/userdata/shm" = + fileSystems."/var/lib/containers/storage/zfs-containers/151ec7c12d73e7e161d8df82605f911820f25e6186d655a18c54b481c4be723f/userdata/shm" = { device = "shm"; fsType = "tmpfs"; }; - fileSystems."/var/lib/containers/storage/zfs/graph/2b2e937f15fc061c5d36b703db6b6c3aa38a39390462cb486f5a6eaa8a8ab2c0" = - { device = "vault/containers/2b2e937f15fc061c5d36b703db6b6c3aa38a39390462cb486f5a6eaa8a8ab2c0"; + fileSystems."/var/lib/containers/storage/zfs/graph/f2a87aec02a119c5c647d9fc498868ccae1974016f1697d7eac76c3e9631782b" = + { device = "vault/containers/f2a87aec02a119c5c647d9fc498868ccae1974016f1697d7eac76c3e9631782b"; + fsType = "zfs"; + }; + + fileSystems."/var/lib/matrix-as-telegram" = + { device = "vault/state_directories/matrix-as-telegram"; fsType = "zfs"; }; @@ -127,7 +132,7 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true; - # networking.interfaces.vethae13c274.useDHCP = lib.mkDefault true; + # networking.interfaces.vethac091923.useDHCP = lib.mkDefault true; # networking.interfaces.wg0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; diff --git a/modules/information.nix b/modules/information.nix index 7b9f8bb..fab432c 100644 --- a/modules/information.nix +++ b/modules/information.nix @@ -51,8 +51,10 @@ backend = "podman"; containers = { openbooks = { - image = "evanbuss/openbooks:latest"; + image = + "evanbuss/openbooks@sha256:16609c3da954715f8f98b5de6c838146914ae700b2a700b4d9aad8b23c9217da"; ports = [ "127.0.0.1:9000:80" ]; + cmd = [ "--name" "bookworm" "--useragent" "HexChat 2.9.1" ]; }; }; }; diff --git a/modules/webstack.nix b/modules/webstack.nix index a3f4c53..07e671a 100644 --- a/modules/webstack.nix +++ b/modules/webstack.nix @@ -143,6 +143,7 @@ forceSSL = true; locations."/" = { proxyPass = "http://localhost:9000/"; + proxyWebsockets = true; extraConfig = '' proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade;