Compare commits
17 Commits
fix/honcho
...
local_chan
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e236581f0 | ||
|
|
65587809aa | ||
|
|
2b1df578ac | ||
|
|
1c806e6390 | ||
|
|
78ab440727 | ||
|
|
ab7da92626 | ||
|
|
e3f7d18d8e | ||
| 5aca97e057 | |||
| a51e095717 | |||
| 9ebbb1c0c6 | |||
| 7f11da1878 | |||
| 29cc20bb04 | |||
| 1617ac9149 | |||
| 24f15c98cd | |||
| bdd6d03739 | |||
| a0a6663793 | |||
| b66ffadb79 |
Submodule assets/compose updated: 63b6cd3461...e525145057
@@ -1,106 +0,0 @@
|
|||||||
# ollama-gfx906/Dockerfile
|
|
||||||
#
|
|
||||||
# Custom ollama image with ROCm 6.1 + gfx906 (MI50) support.
|
|
||||||
# The official ollama/rocm image ships ROCm 7.2 which dropped gfx906.
|
|
||||||
# This uses v0.23.2's native CMake build system with AMDGPU_TARGETS including gfx906.
|
|
||||||
#
|
|
||||||
# Build: docker build -t ollama/ollama:rocm-gfx906 ai/ollama
|
|
||||||
|
|
||||||
FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
|
|
||||||
|
|
||||||
# Build dependencies (CMake, Ninja, Go)
|
|
||||||
ARG CMAKEVERSION=3.31.2
|
|
||||||
ARG NINJAVERSION=1.12.1
|
|
||||||
ARG GOLANG_VERSION=1.22.0
|
|
||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
curl git ccache build-essential pkg-config unzip \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Install CMake from official binaries
|
|
||||||
RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v${CMAKEVERSION}/cmake-${CMAKEVERSION}-linux-x86_64.tar.gz \
|
|
||||||
| tar xz -C /usr/local --strip-components 1
|
|
||||||
|
|
||||||
# Install Ninja
|
|
||||||
RUN curl -fsSL -o /tmp/ninja.zip \
|
|
||||||
https://github.com/ninja-build/ninja/releases/download/v${NINJAVERSION}/ninja-linux.zip \
|
|
||||||
&& unzip /tmp/ninja.zip -d /usr/local/bin && rm /tmp/ninja.zip
|
|
||||||
|
|
||||||
# Install Go
|
|
||||||
RUN curl -fsSL https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \
|
|
||||||
| tar xz -C /usr/local
|
|
||||||
ENV PATH=/usr/local/go/bin:$PATH
|
|
||||||
|
|
||||||
ARG OLLAMA_VERSION=v0.23.2
|
|
||||||
RUN git clone --depth 1 --branch ${OLLAMA_VERSION} https://github.com/ollama/ollama.git /build
|
|
||||||
WORKDIR /build
|
|
||||||
|
|
||||||
# ROCm paths
|
|
||||||
ENV HIP_PATH=/opt/rocm
|
|
||||||
ENV ROCM_PATH=/opt/rocm
|
|
||||||
ENV CMAKE_GENERATOR=Ninja
|
|
||||||
ENV LDFLAGS=-s
|
|
||||||
|
|
||||||
# Step 1: Build CPU backends with GCC (no ROCm preset)
|
|
||||||
# Pre-set CMAKE_HIP_COMPILER="" to prevent check_language(HIP) from
|
|
||||||
# finding a HIP compiler (it searches /opt/rocm even without PATH).
|
|
||||||
# Remove /opt/rocm from PATH to prevent find_program from finding hipcc.
|
|
||||||
RUN mkdir -p build-cpu && \
|
|
||||||
PATH=/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
|
|
||||||
cmake -B build-cpu -DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_HIP_COMPILER="" \
|
|
||||||
-DCMAKE_INSTALL_PREFIX=/build/dist && \
|
|
||||||
cmake --build build-cpu --target ggml-cpu -- -l $(nproc) && \
|
|
||||||
cmake --install build-cpu --component CPU --strip && \
|
|
||||||
echo "=== CPU install ===" && \
|
|
||||||
(find /build/dist/lib/ollama -type f -o -type l 2>&1 | head -20 || echo "empty")
|
|
||||||
|
|
||||||
# Step 2: Build HIP backend with ROCm preset + gfx906 target only
|
|
||||||
# The ROCm 6 preset enables HIP language detection (enable_language(HIP))
|
|
||||||
# which ensures GPU kernels are properly compiled for gfx906.
|
|
||||||
# OLLAMA_RUNNER_DIR=rocm from the preset, so HIP goes to lib/ollama/rocm/
|
|
||||||
# Need CMAKE_PREFIX_PATH so find_package(hip) finds hip-config.cmake
|
|
||||||
# at /opt/rocm/lib/cmake/hip/hip-config.cmake.
|
|
||||||
RUN mkdir -p build-hip && \
|
|
||||||
cmake -B build-hip \
|
|
||||||
--preset 'ROCm 6' \
|
|
||||||
-DAMDGPU_TARGETS="gfx906:xnack-" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DCMAKE_PREFIX_PATH="/opt/rocm" && \
|
|
||||||
cmake --build build-hip --target ggml-hip -- -l $(nproc) && \
|
|
||||||
cmake --install build-hip --component HIP --strip && \
|
|
||||||
echo "=== HIP install ===" && \
|
|
||||||
find /build/dist/lib/ollama -type f -o -type l | head -20
|
|
||||||
|
|
||||||
# Step 3: Build Go binary (GCC for CGo linking)
|
|
||||||
ENV CGO_ENABLED=1
|
|
||||||
RUN go build -trimpath -ldflags="-X=github.com/ollama/ollama/version.Version=${OLLAMA_VERSION}" -o /build/dist/ollama .
|
|
||||||
|
|
||||||
# ---------- Runtime image ----------
|
|
||||||
FROM ubuntu:24.04
|
|
||||||
|
|
||||||
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
||||||
ca-certificates curl libstdc++6 libgomp1 libvulkan1 libopenblas0 \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Copy ROCm 6.1 runtime libraries
|
|
||||||
# These are needed at runtime by ggml-hip via LD_LIBRARY_PATH
|
|
||||||
COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
|
|
||||||
COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
|
|
||||||
|
|
||||||
# Copy ollama binary + all backends (CPU + HIP)
|
|
||||||
# CPU install: /build/dist/lib/ollama/libggml-*.so
|
|
||||||
# HIP install: /build/dist/lib/ollama/rocm/libggml-hip.so
|
|
||||||
COPY --from=builder /build/dist/ollama /usr/bin/ollama
|
|
||||||
COPY --from=builder /build/dist/lib/ollama/ /usr/lib/ollama/
|
|
||||||
|
|
||||||
RUN ldconfig
|
|
||||||
|
|
||||||
ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/lib/ollama/rocm:/usr/lib/ollama
|
|
||||||
ENV HSA_OVERRIDE_GFX_VERSION=9.0.6
|
|
||||||
ENV HCC_AMDGPU_TARGET=gfx906
|
|
||||||
ENV HSA_ENABLE_SDMA=0
|
|
||||||
|
|
||||||
EXPOSE 11434
|
|
||||||
ENTRYPOINT ["/bin/ollama"]
|
|
||||||
CMD ["serve"]
|
|
||||||
188
flake.lock
generated
188
flake.lock
generated
@@ -23,6 +23,38 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"argononed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729566243,
|
||||||
|
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"argononed_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729566243,
|
||||||
|
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -37,6 +69,36 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -144,6 +206,130 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-images": {
|
||||||
|
"inputs": {
|
||||||
|
"nixos-stable": [
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixos-unstable": [
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1747747741,
|
||||||
|
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"ref": "sdimage-installer",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-images_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixos-stable": [
|
||||||
|
"nixos-uconsole",
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixos-unstable": [
|
||||||
|
"nixos-uconsole",
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1747747741,
|
||||||
|
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"ref": "sdimage-installer",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-raspberrypi": {
|
||||||
|
"inputs": {
|
||||||
|
"argononed": "argononed",
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixos-images": "nixos-images",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779023229,
|
||||||
|
"narHash": "sha256-MInilg7B/06c34SwOuGSBho4l0H1EZcmvxTkSWCs5pE=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"rev": "06c6e3513e1ee64b651913193fc6ac38aa4963f5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"ref": "v1.20260517.0",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-raspberrypi_2": {
|
||||||
|
"inputs": {
|
||||||
|
"argononed": "argononed_2",
|
||||||
|
"flake-compat": "flake-compat_3",
|
||||||
|
"nixos-images": "nixos-images_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixos-uconsole",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779023229,
|
||||||
|
"narHash": "sha256-MInilg7B/06c34SwOuGSBho4l0H1EZcmvxTkSWCs5pE=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"rev": "06c6e3513e1ee64b651913193fc6ac38aa4963f5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"ref": "v1.20260517.0",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-uconsole": {
|
||||||
|
"inputs": {
|
||||||
|
"nixos-raspberrypi": "nixos-raspberrypi_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1780333979,
|
||||||
|
"narHash": "sha256-yjp/gWRqWCxalYLe2+27gbxhttL+46Ozm7qvccpFbv4=",
|
||||||
|
"owner": "nixos-uconsole",
|
||||||
|
"repo": "nixos-uconsole",
|
||||||
|
"rev": "1e6a8dc51c7b26e15850688a0b01121c3fea4b30",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos-uconsole",
|
||||||
|
"repo": "nixos-uconsole",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705033721,
|
"lastModified": 1705033721,
|
||||||
@@ -212,6 +398,8 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
|
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||||
|
"nixos-uconsole": "nixos-uconsole",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixos-raspberrypi = {
|
nixos-raspberrypi = {
|
||||||
url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
|
url = "github:nvmd/nixos-raspberrypi/v1.20260517.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
self.submodules = true;
|
self.submodules = true;
|
||||||
@@ -69,7 +69,6 @@
|
|||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
./modules/nixos/services/openclaw_node.nix
|
./modules/nixos/services/openclaw_node.nix
|
||||||
./modules/nixos/services/rollback-sentinel.nix
|
|
||||||
./modules/nixos/security/ai-worker-restricted.nix
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
./users/gortium.nix
|
./users/gortium.nix
|
||||||
./users/ai-worker.nix
|
./users/ai-worker.nix
|
||||||
|
|||||||
@@ -11,6 +11,10 @@
|
|||||||
# Flakesss
|
# Flakesss
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
nix.settings.extra-platforms = [ "aarch64-linux" ];
|
||||||
|
|
||||||
|
# QEMU binfmt for cross-building aarch64 NixOS targets
|
||||||
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
|
|
||||||
# Garbage collection
|
# Garbage collection
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
@@ -140,6 +144,7 @@
|
|||||||
# You can use https://Search.nixos.org/ to find more packages (and options).
|
# You can use https://Search.nixos.org/ to find more packages (and options).
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
neovim
|
neovim
|
||||||
|
tmux
|
||||||
docker-compose
|
docker-compose
|
||||||
wget
|
wget
|
||||||
age
|
age
|
||||||
@@ -252,12 +257,6 @@
|
|||||||
# };
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
services.opencode = {
|
|
||||||
enable = true;
|
|
||||||
port = 4099;
|
|
||||||
ollamaUrl = "http://127.0.0.1:11434/v1";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Private host ssh key managed by agenix
|
# Private host ssh key managed by agenix
|
||||||
age = {
|
age = {
|
||||||
identityPaths = paths.identities;
|
identityPaths = paths.identities;
|
||||||
@@ -307,54 +306,14 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# OpenClaw Node service (host-side execution for Docker gateway)
|
|
||||||
services.openclaw-node = {
|
|
||||||
enable = true;
|
|
||||||
user = "ai-worker";
|
|
||||||
gatewayHost = "127.0.0.1";
|
|
||||||
gatewayPort = 18789;
|
|
||||||
gatewayTokenFile = "/run/secrets/openclaw_gateway_token";
|
|
||||||
displayName = "lazyworkhorse-host";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Public host ssh key (kept in sync with the private one)
|
# Public host ssh key (kept in sync with the private one)
|
||||||
environment.etc."ssh/ssh_host_ed25519_key.pub".text =
|
environment.etc."ssh/ssh_host_ed25519_key.pub".text =
|
||||||
"${keys.hosts.lazyworkhorse.main}";
|
"${keys.hosts.lazyworkhorse.main}";
|
||||||
|
|
||||||
# ── Boot sentinel: auto-rollback on critical service failure ───────────────
|
|
||||||
services.rollbackSentinel.enable = true;
|
|
||||||
# Tier-1: failure triggers rollback
|
|
||||||
services.rollbackSentinel.tier1Services = [
|
|
||||||
"sshd" "docker" "traefik" "authelia"
|
|
||||||
];
|
|
||||||
# Tier-2: warn only
|
|
||||||
services.rollbackSentinel.tier2Services = [
|
|
||||||
"gitea" "hermes" "ollama" "synapse" "nextcloud"
|
|
||||||
"vaultwarden" "wireguard" "homeassistant" "fail2ban"
|
|
||||||
];
|
|
||||||
# Wait 2 minutes after boot before checking (lets services initialize)
|
|
||||||
services.rollbackSentinel.bootDelay = "120";
|
|
||||||
# Change boot default only (not --rollback-now) for safety
|
|
||||||
services.rollbackSentinel.rollbackMode = "set-default";
|
|
||||||
|
|
||||||
services.fstrim.enable = true;
|
services.fstrim.enable = true;
|
||||||
|
|
||||||
services.zfs.autoSnapshot.enable = true;
|
services.zfs.autoSnapshot.enable = true;
|
||||||
services.zfs.autoScrub.enable = true;
|
services.zfs.autoScrub.enable = true;
|
||||||
|
|
||||||
# Ensure com.sun:auto-snapshot is set on ZFS datasets so auto-snapshots actually run
|
|
||||||
systemd.services."zfs-set-auto-snapshot" = {
|
|
||||||
description = "Set com.sun:auto-snapshot=true on ZFS datasets";
|
|
||||||
after = [ "zfs-import.target" ];
|
|
||||||
wants = [ "zfs-import.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = with pkgs; [ zfs ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
ExecStart = "${pkgs.zfs}/bin/zfs set -r com.sun:auto-snapshot=true rpool";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Mi50 config
|
# Mi50 config
|
||||||
hardware.graphics = {
|
hardware.graphics = {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, paths, self, ... }:
|
{ config, lib, pkgs, paths, self, keys, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Basic Host Info
|
# Basic Host Info
|
||||||
@@ -9,15 +9,17 @@
|
|||||||
# System State
|
# System State
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
|
|
||||||
# Boot & Hardware (uconsole-cm5 module handles boot.loader)
|
# Boot & Hardware (migrated to kernel bootloader per nixos-raspberrypi deprecation notice)
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||||
|
# kernel managed by nixos-raspberrypi module — don't override, patches are version-specific
|
||||||
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
# Networking
|
# Networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.PermitRootLogin = "prohibit-password";
|
settings.PermitRootLogin = lib.mkForce "prohibit-password";
|
||||||
settings.PasswordAuthentication = false;
|
settings.PasswordAuthentication = lib.mkForce false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# User
|
# User
|
||||||
@@ -106,6 +108,7 @@
|
|||||||
# ============================================================
|
# ============================================================
|
||||||
systemd.services.rnsd = {
|
systemd.services.rnsd = {
|
||||||
description = "Reticulum Network Stack Daemon";
|
description = "Reticulum Network Stack Daemon";
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
after = [ "network-online.target" ];
|
after = [ "network-online.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
@@ -123,6 +126,7 @@
|
|||||||
# ============================================================
|
# ============================================================
|
||||||
systemd.services.kismet = {
|
systemd.services.kismet = {
|
||||||
description = "Kismet Wi-Fi Monitor & IDS";
|
description = "Kismet Wi-Fi Monitor & IDS";
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
after = [ "network-online.target" ];
|
after = [ "network-online.target" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|||||||
@@ -1,400 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# =============================================================================
|
|
||||||
# nixos-rollback.sh — NixOS systemd-boot Rollback Script
|
|
||||||
#
|
|
||||||
# Detects a failed NixOS generation (critical services not starting) and sets
|
|
||||||
# the previous generation as the default boot option for systemd-boot.
|
|
||||||
# Logs all actions to syslog/journald and a local logfile. Fails safely when
|
|
||||||
# no previous generation exists or required files are missing.
|
|
||||||
#
|
|
||||||
# Integration with the boot sentinel:
|
|
||||||
# sentinel-check.sh → detects Tier-1 service failures (sshd, docker,
|
|
||||||
# traefik, authelia) after a boot
|
|
||||||
# nixos-rollback.sh ← called when sentinel exits nonzero; sets previous
|
|
||||||
# generation as default for next boot
|
|
||||||
#
|
|
||||||
# Usage:
|
|
||||||
# nixos-rollback.sh # auto-detect & set previous gen
|
|
||||||
# nixos-rollback.sh --dry-run # show what would be done
|
|
||||||
# nixos-rollback.sh --rollback-now # also run nixos-rebuild switch
|
|
||||||
# # --rollback for immediate fix
|
|
||||||
# nixos-rollback.sh --help # full help text
|
|
||||||
#
|
|
||||||
# Exit codes:
|
|
||||||
# 0 — rollback applied (or dry-run would apply)
|
|
||||||
# 1 — preflight failure (missing files, permissions)
|
|
||||||
# 2 — no previous generation available
|
|
||||||
# 3 — nixos-rebuild --rollback failed (only with --rollback-now)
|
|
||||||
#
|
|
||||||
# Installation on NixOS:
|
|
||||||
# Place in /usr/local/bin/nixos-rollback.sh and make executable.
|
|
||||||
# Add a systemd oneshot service to run it after sentinel-check detects
|
|
||||||
# failures, or invoke directly from a sentinel timer.
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# ── Configuration ────────────────────────────────────────────────────────────
|
|
||||||
# These can be overridden via environment variables for testing.
|
|
||||||
LOADER_CONF="${NIXOS_ROLLBACK_LOADER_CONF:-/boot/loader/loader.conf}"
|
|
||||||
ENTRIES_DIR="${NIXOS_ROLLBACK_ENTRIES_DIR:-/boot/loader/entries}"
|
|
||||||
LOGFILE="${NIXOS_ROLLBACK_LOGFILE:-/var/log/nixos-rollback.log}"
|
|
||||||
SYSLOG_IDENT="nixos-rollback"
|
|
||||||
|
|
||||||
# ── CLI flags ────────────────────────────────────────────────────────────────
|
|
||||||
DRY_RUN=false
|
|
||||||
ROLLBACK_NOW=false
|
|
||||||
|
|
||||||
# ── Colors (disabled when not a terminal) ────────────────────────────────────
|
|
||||||
if [ -t 1 ]; then
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
YELLOW='\033[1;33m'
|
|
||||||
CYAN='\033[0;36m'
|
|
||||||
NC='\033[0m' # No Color
|
|
||||||
else
|
|
||||||
RED=''; GREEN=''; YELLOW=''; CYAN=''; NC=''
|
|
||||||
fi
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Help
|
|
||||||
# =============================================================================
|
|
||||||
usage() {
|
|
||||||
cat <<EOF
|
|
||||||
${CYAN}nixos-rollback.sh${NC} — Set the previous NixOS generation as systemd-boot default
|
|
||||||
|
|
||||||
${CYAN}USAGE${NC}
|
|
||||||
nixos-rollback.sh [OPTIONS]
|
|
||||||
|
|
||||||
${CYAN}OPTIONS${NC}
|
|
||||||
--dry-run Show what would be done without making changes
|
|
||||||
--rollback-now Also run 'nixos-rebuild switch --rollback' for
|
|
||||||
immediate fix of the running system (requires
|
|
||||||
nixos-rebuild on PATH)
|
|
||||||
-h, --help Show this help text
|
|
||||||
|
|
||||||
${CYAN}DESCRIPTION${NC}
|
|
||||||
Reads the current default boot entry from ${LOADER_CONF},
|
|
||||||
determines the previous generation number, and writes it as the
|
|
||||||
new default. The script only modifies systemd-boot config —
|
|
||||||
it does NOT touch the Nix store or system profile unless
|
|
||||||
--rollback-now is passed.
|
|
||||||
|
|
||||||
Designed as the rollback half of a boot sentinel:
|
|
||||||
1. System boots into generation N
|
|
||||||
2. sentinel-check.sh detects Tier-1 service failures
|
|
||||||
3. nixos-rollback.sh sets default to generation N-1
|
|
||||||
4. Next reboot uses the working generation
|
|
||||||
|
|
||||||
${CYAN}EXIT CODES${NC}
|
|
||||||
0 Rollback applied (or dry-run would apply)
|
|
||||||
1 Preflight failure (missing files, permissions)
|
|
||||||
2 No previous generation available (only one generation)
|
|
||||||
3 nixos-rebuild --rollback failed (with --rollback-now)
|
|
||||||
|
|
||||||
${CYAN}FILES${NC}
|
|
||||||
${LOADER_CONF} systemd-boot loader configuration
|
|
||||||
${ENTRIES_DIR}/ generation entry .conf files
|
|
||||||
${LOGFILE} action log (append-only)
|
|
||||||
EOF
|
|
||||||
}
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Logging
|
|
||||||
# =============================================================================
|
|
||||||
log() {
|
|
||||||
local level="$1"; shift
|
|
||||||
local msg="$*"
|
|
||||||
local timestamp
|
|
||||||
timestamp="$(date '+%Y-%m-%d %H:%M:%S')"
|
|
||||||
echo "${timestamp} [${level}] ${msg}" >> "${LOGFILE}"
|
|
||||||
logger -t "${SYSLOG_IDENT}" -p "user.${level}" "${msg}"
|
|
||||||
|
|
||||||
# Also print to stderr for ERROR/WARN, stdout for INFO
|
|
||||||
case "${level}" in
|
|
||||||
ERROR) echo >&2 "${RED}[ERROR]${NC} ${msg}" ;;
|
|
||||||
WARN) echo >&2 "${YELLOW}[WARN]${NC} ${msg}" ;;
|
|
||||||
INFO) echo " ${GREEN}[INFO]${NC} ${msg}" ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
info() { log "INFO" "$@"; }
|
|
||||||
warn() { log "WARN" "$@"; }
|
|
||||||
error() { log "ERROR" "$@"; }
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Preflight checks
|
|
||||||
# =============================================================================
|
|
||||||
preflight() {
|
|
||||||
# Must run as root (need to write to /boot), unless overridden for testing
|
|
||||||
if [ -z "${NIXOS_ROLLBACK_SKIP_ROOT_CHECK:-}" ] && [ "$(id -u)" -ne 0 ]; then
|
|
||||||
error "This script must be run as root (needs write access to /boot/loader)"
|
|
||||||
error "Set NIXOS_ROLLBACK_SKIP_ROOT_CHECK=1 for testing against mock paths."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Directories and files
|
|
||||||
if [ ! -d "${ENTRIES_DIR}" ]; then
|
|
||||||
error "Boot entries directory not found: ${ENTRIES_DIR}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "${LOADER_CONF}" ]; then
|
|
||||||
error "Loader config not found: ${LOADER_CONF}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -r "${LOADER_CONF}" ]; then
|
|
||||||
error "Cannot read loader config: ${LOADER_CONF}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check write access to /boot/loader (parent of loader.conf)
|
|
||||||
local loader_dir
|
|
||||||
loader_dir="$(dirname "${LOADER_CONF}")"
|
|
||||||
if [ ! -w "${loader_dir}" ]; then
|
|
||||||
error "Cannot write to ${loader_dir} (insufficient permissions)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Logfile directory must exist
|
|
||||||
local log_dir
|
|
||||||
log_dir="$(dirname "${LOGFILE}")"
|
|
||||||
if [ ! -d "${log_dir}" ]; then
|
|
||||||
warn "Log directory ${log_dir} does not exist, creating it"
|
|
||||||
mkdir -p "${log_dir}" 2>/dev/null || {
|
|
||||||
error "Cannot create log directory ${log_dir}"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check --rollback-now dependencies
|
|
||||||
if [ "${ROLLBACK_NOW}" = true ]; then
|
|
||||||
if ! command -v nixos-rebuild &>/dev/null; then
|
|
||||||
error "nixos-rebuild not found on PATH (required for --rollback-now)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Generation helpers
|
|
||||||
# =============================================================================
|
|
||||||
|
|
||||||
# get_current_default: reads the current default entry from loader.conf
|
|
||||||
# Returns: "nixos-generation-N.conf" or empty string
|
|
||||||
get_current_default() {
|
|
||||||
grep -E '^default\s+' "${LOADER_CONF}" 2>/dev/null \
|
|
||||||
| awk '{print $2}' \
|
|
||||||
|| true
|
|
||||||
}
|
|
||||||
|
|
||||||
# extract_gen_number: extracts the numeric generation from a conf filename
|
|
||||||
# Input: "nixos-generation-367.conf"
|
|
||||||
# Output: 367
|
|
||||||
extract_gen_number() {
|
|
||||||
echo "$1" | sed 's/nixos-generation-//;s/\.conf//'
|
|
||||||
}
|
|
||||||
|
|
||||||
# get_all_gen_numbers: returns sorted list of generation numbers from entries dir
|
|
||||||
get_all_gen_numbers() {
|
|
||||||
local -a gens=()
|
|
||||||
local f n
|
|
||||||
for f in "${ENTRIES_DIR}"/nixos-generation-*.conf; do
|
|
||||||
[ -f "${f}" ] || continue
|
|
||||||
n="$(basename "${f}" | sed 's/nixos-generation-//;s/\.conf//')"
|
|
||||||
gens+=("${n}")
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "${#gens[@]}" -eq 0 ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Sort numerically and output
|
|
||||||
printf '%s\n' "${gens[@]}" | sort -n
|
|
||||||
}
|
|
||||||
|
|
||||||
# get_previous_gen: given current generation number, find the previous one
|
|
||||||
# from the list of all available generations
|
|
||||||
get_previous_gen() {
|
|
||||||
local current="$1"
|
|
||||||
shift
|
|
||||||
local -a gens=("$@")
|
|
||||||
|
|
||||||
local prev=""
|
|
||||||
local g
|
|
||||||
for g in "${gens[@]}"; do
|
|
||||||
if [ "${g}" -lt "${current}" ]; then
|
|
||||||
prev="${g}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -z "${prev}" ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
echo "${prev}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Main rollback logic
|
|
||||||
# =============================================================================
|
|
||||||
do_rollback() {
|
|
||||||
# Step 1: Read current default
|
|
||||||
local current_entry
|
|
||||||
current_entry="$(get_current_default)"
|
|
||||||
|
|
||||||
if [ -z "${current_entry}" ]; then
|
|
||||||
error "No 'default' entry found in ${LOADER_CONF}"
|
|
||||||
error "Cannot determine current generation — aborting"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Current default boot entry: ${current_entry}"
|
|
||||||
|
|
||||||
# Step 2: Build sorted list of all available generations
|
|
||||||
local -a all_gens=()
|
|
||||||
local line
|
|
||||||
while IFS= read -r line; do
|
|
||||||
all_gens+=("${line}")
|
|
||||||
done < <(get_all_gen_numbers || true)
|
|
||||||
|
|
||||||
if [ "${#all_gens[@]}" -eq 0 ]; then
|
|
||||||
error "No NixOS generation .conf files found in ${ENTRIES_DIR}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Available generations: ${all_gens[*]}"
|
|
||||||
|
|
||||||
# Step 3: Find current generation number
|
|
||||||
local current_gen
|
|
||||||
current_gen="$(extract_gen_number "${current_entry}")"
|
|
||||||
|
|
||||||
# Verify current_gen is a valid number
|
|
||||||
if ! [[ "${current_gen}" =~ ^[0-9]+$ ]]; then
|
|
||||||
error "Could not parse generation number from '${current_entry}'"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Step 4: Find the previous generation
|
|
||||||
local prev_gen
|
|
||||||
prev_gen="$(get_previous_gen "${current_gen}" "${all_gens[@]}")" || {
|
|
||||||
error "No previous generation found before generation ${current_gen}"
|
|
||||||
error "This is the oldest available generation — cannot roll back further"
|
|
||||||
exit 2
|
|
||||||
}
|
|
||||||
|
|
||||||
local prev_entry="nixos-generation-${prev_gen}.conf"
|
|
||||||
local prev_conf_path="${ENTRIES_DIR}/${prev_entry}"
|
|
||||||
|
|
||||||
if [ ! -f "${prev_conf_path}" ]; then
|
|
||||||
error "Previous generation entry not found: ${prev_conf_path}"
|
|
||||||
error "The .conf file for generation ${prev_gen} is missing — cannot roll back"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Target rollback generation: ${prev_gen} → ${prev_entry}"
|
|
||||||
|
|
||||||
# Step 5: Apply the rollback
|
|
||||||
if [ "${DRY_RUN}" = true ]; then
|
|
||||||
echo ""
|
|
||||||
echo " ${CYAN}[DRY RUN]${NC} Would change ${LOADER_CONF}:"
|
|
||||||
echo " ${YELLOW}-${NC} default ${current_entry}"
|
|
||||||
echo " ${GREEN}+${NC} default ${prev_entry}"
|
|
||||||
echo ""
|
|
||||||
info "DRY RUN — no changes made"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Write new default
|
|
||||||
# Use sed with a backup (.bak)
|
|
||||||
sed -i.bak "s/^default\s\+${current_entry}/default ${prev_entry}/" "${LOADER_CONF}"
|
|
||||||
|
|
||||||
# Verify the change was applied
|
|
||||||
local new_default
|
|
||||||
new_default="$(get_current_default)"
|
|
||||||
if [ "${new_default}" != "${prev_entry}" ]; then
|
|
||||||
error "Failed to set default boot entry to ${prev_entry}"
|
|
||||||
error "Current default is still: ${new_default}"
|
|
||||||
# Attempt to restore backup
|
|
||||||
if [ -f "${LOADER_CONF}.bak" ]; then
|
|
||||||
cp "${LOADER_CONF}.bak" "${LOADER_CONF}"
|
|
||||||
info "Restored backup from ${LOADER_CONF}.bak"
|
|
||||||
fi
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Successfully set default boot entry to ${prev_entry} (generation ${prev_gen})"
|
|
||||||
info "Backup of previous config saved to ${LOADER_CONF}.bak"
|
|
||||||
|
|
||||||
# Step 6: Optionally run nixos-rebuild switch --rollback
|
|
||||||
if [ "${ROLLBACK_NOW}" = true ]; then
|
|
||||||
echo ""
|
|
||||||
info "Running nixos-rebuild switch --rollback for immediate effect..."
|
|
||||||
if nixos-rebuild switch --rollback 2>&1 | while IFS= read -r line; do
|
|
||||||
logger -t "${SYSLOG_IDENT}" "nixos-rebuild: ${line}"
|
|
||||||
echo " ${line}"
|
|
||||||
done; then
|
|
||||||
info "nixos-rebuild switch --rollback completed successfully"
|
|
||||||
else
|
|
||||||
local rc=$?
|
|
||||||
error "nixos-rebuild switch --rollback failed with exit code ${rc}"
|
|
||||||
error "The boot default has been changed but the current system was NOT rolled back"
|
|
||||||
error "Reboot to apply the rollback"
|
|
||||||
exit 3
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
info "Rollback complete. Next boot will use generation ${prev_gen}."
|
|
||||||
if [ "${ROLLBACK_NOW}" = false ]; then
|
|
||||||
echo ""
|
|
||||||
echo " ${YELLOW}NOTE:${NC} The current running system is unchanged."
|
|
||||||
echo " Reboot to boot into generation ${prev_gen}."
|
|
||||||
echo " Or re-run with --rollback-now for immediate effect."
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# =============================================================================
|
|
||||||
# Main
|
|
||||||
# =============================================================================
|
|
||||||
main() {
|
|
||||||
# Parse arguments
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
case "$1" in
|
|
||||||
--dry-run)
|
|
||||||
DRY_RUN=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--rollback-now)
|
|
||||||
ROLLBACK_NOW=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-h|--help)
|
|
||||||
usage
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo >&2 "Unknown option: $1"
|
|
||||||
echo >&2 "Use --help for usage information."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo " ${CYAN}═══ NixOS systemd-boot Rollback ═══${NC}"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
preflight
|
|
||||||
|
|
||||||
if [ "${DRY_RUN}" = true ]; then
|
|
||||||
info "DRY RUN mode — no changes will be made"
|
|
||||||
fi
|
|
||||||
if [ "${ROLLBACK_NOW}" = true ]; then
|
|
||||||
info "ROLLBACK NOW mode — will also run nixos-rebuild switch --rollback"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
do_rollback
|
|
||||||
}
|
|
||||||
|
|
||||||
main "$@"
|
|
||||||
@@ -1,184 +0,0 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.rollbackSentinel;
|
|
||||||
|
|
||||||
# ── Scripts ────────────────────────────────────────────────────────────────
|
|
||||||
|
|
||||||
# Sentinel check — verifies Tier-1 services are active after boot.
|
|
||||||
# Exits nonzero when any Tier-1 service is down, which triggers the rollback.
|
|
||||||
sentinelCheck = pkgs.writeShellScriptBin "sentinel-check.sh" ''
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
SYSLOG_IDENT="nixos-sentinel"
|
|
||||||
LOGFILE="/var/log/nixos-sentinel.log"
|
|
||||||
|
|
||||||
echo "=== NixOS Sentinel Check ==="
|
|
||||||
echo "Tier-1 services: ${builtins.toString cfg.tier1Services}"
|
|
||||||
echo "Tier-2 services: ${builtins.toString cfg.tier2Services}"
|
|
||||||
|
|
||||||
FAILED=0
|
|
||||||
|
|
||||||
# Check Tier-1 services — any failure means rollback
|
|
||||||
for svc in ${builtins.toString cfg.tier1Services}; do
|
|
||||||
if systemctl is-active --quiet "$svc" 2>/dev/null; then
|
|
||||||
echo " [OK] Tier-1: $svc"
|
|
||||||
else
|
|
||||||
echo " [FAIL] Tier-1: $svc is NOT active"
|
|
||||||
logger -t "$SYSLOG_IDENT" -p user.err "Tier-1 FAILURE: $svc is not active"
|
|
||||||
FAILED=1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Check Tier-2 services — warn only
|
|
||||||
for svc in ${builtins.toString cfg.tier2Services}; do
|
|
||||||
if systemctl is-active --quiet "$svc" 2>/dev/null; then
|
|
||||||
echo " [OK] Tier-2: $svc"
|
|
||||||
else
|
|
||||||
echo " [WARN] Tier-2: $svc is NOT active"
|
|
||||||
logger -t "$SYSLOG_IDENT" -p user.warn "Tier-2 WARNING: $svc is not active"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "=== Sentinel result: $([ "$FAILED" -eq 0 ] && echo 'PASS' || echo 'FAIL') ==="
|
|
||||||
echo "$(date '+%Y-%m-%d %H:%M:%S') [INFO] sentinel $([ "$FAILED" -eq 0 ] && echo 'PASS' || echo 'FAIL')" >> "$LOGFILE"
|
|
||||||
exit $FAILED
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Rollback script — package the companion shell script from this directory.
|
|
||||||
# Uses builtins.readFile to embed the content at evaluation time.
|
|
||||||
rollbackScript = pkgs.writeShellScriptBin "nixos-rollback.sh" (builtins.readFile ./nixos-rollback.sh);
|
|
||||||
|
|
||||||
# Resolve rollback flags from config
|
|
||||||
rollbackFlags =
|
|
||||||
if cfg.rollbackMode == "dry-run" then "--dry-run"
|
|
||||||
else if cfg.rollbackMode == "rollback-now" then "--rollback-now"
|
|
||||||
else "";
|
|
||||||
|
|
||||||
in {
|
|
||||||
options.services.rollbackSentinel = {
|
|
||||||
enable = mkEnableOption "NixOS Rollback Sentinel — auto-rollback on critical service failure";
|
|
||||||
|
|
||||||
tier1Services = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
default = [ "sshd" "docker" "traefik" "authelia" ];
|
|
||||||
description = ''
|
|
||||||
Tier-1 services whose failure triggers an automatic systemd-boot rollback.
|
|
||||||
On boot, the sentinel waits ${cfg.bootDelay} seconds, then checks each
|
|
||||||
service. If ANY service in this list is inactive, it runs the rollback
|
|
||||||
script which sets the previous NixOS generation as the default boot entry.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
tier2Services = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
default = [
|
|
||||||
"gitea" "hermes" "ollama" "synapse" "nextcloud"
|
|
||||||
"vaultwarden" "wireguard" "homeassistant" "fail2ban"
|
|
||||||
];
|
|
||||||
description = ''
|
|
||||||
Tier-2 services whose failure is logged as a warning but does NOT trigger
|
|
||||||
an automatic rollback. Useful for detecting non-critical service issues.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
tier3InfoServices = mkOption {
|
|
||||||
type = types.listOf types.str;
|
|
||||||
default = [
|
|
||||||
"act_runner" "syncthing" "restic" "fava"
|
|
||||||
"homer" "cups" "fstrim"
|
|
||||||
];
|
|
||||||
description = ''
|
|
||||||
Tier-3 informational checks (log-only, no warning). These are services
|
|
||||||
that the sentinel will note the status of for diagnostics.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
bootDelay = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "120";
|
|
||||||
description = ''
|
|
||||||
Seconds to wait after multi-user.target before running the boot-time
|
|
||||||
sentinel check. This gives Tier-1 services time to start before
|
|
||||||
the sentinel decides they've failed.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
rollbackMode = mkOption {
|
|
||||||
type = types.enum [ "set-default" "rollback-now" "dry-run" ];
|
|
||||||
default = "set-default";
|
|
||||||
description = ''
|
|
||||||
Rollback strategy when Tier-1 failures are detected:
|
|
||||||
- set-default: Write the previous generation to loader.conf (next reboot).
|
|
||||||
- rollback-now: Also run nixos-rebuild switch --rollback for immediate fix.
|
|
||||||
- dry-run: Log what would happen but take no action (testing).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
enablePostRebuild = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = ''
|
|
||||||
When enabled, the sentinel check runs after every nixos-rebuild switch
|
|
||||||
activation. If a newly deployed generation has Tier-1 failures, it
|
|
||||||
triggers rollback immediately.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# ── Deploy scripts to PATH ───────────────────────────────────────────────
|
|
||||||
environment.systemPackages = [ sentinelCheck rollbackScript ];
|
|
||||||
|
|
||||||
# Ensure log directory exists
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /var/log/nixos-sentinel 0755 root root -"
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── Boot-time sentinel service ───────────────────────────────────────────
|
|
||||||
# Runs after multi-user.target with a configurable delay, checks Tier-1
|
|
||||||
# services, and triggers rollback if any are down.
|
|
||||||
systemd.services.nixos-sentinel = {
|
|
||||||
description = "NixOS Boot Sentinel — check critical services, roll back on failure";
|
|
||||||
after = [ "network.target" "multi-user.target" ];
|
|
||||||
wants = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
|
|
||||||
path = with pkgs; [ coreutils gawk gnused systemd ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep ${cfg.bootDelay}";
|
|
||||||
ExecStart = "${sentinelCheck}/bin/sentinel-check.sh";
|
|
||||||
ExecStartPost = "${rollbackScript}/bin/nixos-rollback.sh ${rollbackFlags}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Post-rebuild sentinel service (triggered by activation script) ──────
|
|
||||||
systemd.services.nixos-sentinel-rebuild = mkIf cfg.enablePostRebuild {
|
|
||||||
description = "NixOS Post-Rebuild Sentinel — check services after nixos-rebuild";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
|
|
||||||
path = with pkgs; [ coreutils gawk gnused systemd ];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = "${sentinelCheck}/bin/sentinel-check.sh";
|
|
||||||
ExecStartPost = "${rollbackScript}/bin/nixos-rollback.sh ${rollbackFlags}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Activation script — fires after every nixos-rebuild switch
|
|
||||||
system.activationScripts.rollback-sentinel = mkIf cfg.enablePostRebuild ''
|
|
||||||
# Start the post-rebuild sentinel in the background.
|
|
||||||
# This runs on every activation (boot + nixos-rebuild). On boot the
|
|
||||||
# boot-time service handles it, so this is primarily for nixos-rebuild,
|
|
||||||
# but running twice is safe (idempotent rollback).
|
|
||||||
systemctl start nixos-sentinel-rebuild.service --no-block 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -5,6 +5,7 @@ in {
|
|||||||
reticulumStack = python3.pkgs.buildPythonApplication rec {
|
reticulumStack = python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "reticulum";
|
pname = "reticulum";
|
||||||
version = "1.2.9";
|
version = "1.2.9";
|
||||||
|
format = "setuptools";
|
||||||
src = pyPkgs.fetchPypi {
|
src = pyPkgs.fetchPypi {
|
||||||
pname = "rns";
|
pname = "rns";
|
||||||
inherit version;
|
inherit version;
|
||||||
@@ -24,6 +25,7 @@ in {
|
|||||||
lxmf = python3.pkgs.buildPythonApplication rec {
|
lxmf = python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "lxmf";
|
pname = "lxmf";
|
||||||
version = "0.9.8";
|
version = "0.9.8";
|
||||||
|
format = "setuptools";
|
||||||
src = pyPkgs.fetchPypi {
|
src = pyPkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
|
sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
|
||||||
@@ -42,6 +44,7 @@ in {
|
|||||||
nomadnet = python3.pkgs.buildPythonApplication rec {
|
nomadnet = python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "nomadnet";
|
pname = "nomadnet";
|
||||||
version = "1.1.1";
|
version = "1.1.1";
|
||||||
|
format = "setuptools";
|
||||||
src = pyPkgs.fetchPypi {
|
src = pyPkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
|
sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
|
||||||
@@ -60,6 +63,7 @@ in {
|
|||||||
rnsh = python3.pkgs.buildPythonApplication rec {
|
rnsh = python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "rnsh";
|
pname = "rnsh";
|
||||||
version = "0.1.7";
|
version = "0.1.7";
|
||||||
|
format = "setuptools";
|
||||||
src = pyPkgs.fetchPypi {
|
src = pyPkgs.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
|
sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
|
||||||
|
|||||||
19
secrets/ai.age
Normal file
19
secrets/ai.age
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA2QUFR
|
||||||
|
RmlnY2pYUFBHZGN3dzNpNVc0UW14V2NaVWZHWDJmcU1iWStsSHpJCnRYQUtEalNt
|
||||||
|
SzFYWUF6VWRyYWF5VCtsSGduRU96MHA0WlI0b0lpUGFram8KLT4gM0stZ3JlYXNl
|
||||||
|
IC5DPExhJQpCMlZRR0E1NGdsYlhNRXZUTVJqTTNHZUZQVUJoYkhheWd3TktvVEFp
|
||||||
|
WnFqbS9xWUxJSmI0U0hqQkdzQU1EVy9BCkhWc3A0Mk45YVBxcnJFWU5qa01LRTVw
|
||||||
|
WlNoWm40cjgyb1RXS3hGdlpRSEs5V0x0cHNvcVBOek0KLS0tIFhiOFExNnRSbEgz
|
||||||
|
M3FmS1owQUdHSXpiWVhLQ0R6emtuK2hZSkkrSTFtTTAKi2hXxTslGLlneDJlvHUm
|
||||||
|
OFsvgsHmiADRaiwDC/iCfWyEFzHyupXKX79B6rjt4Up2yUWHLHy4pyCvJiezAh1J
|
||||||
|
uxvtVmUYrqYOUoUHCEMLjjVydh5tt+22yXezV0ecU2ePiAgb0gv9EwH8t+70An6Z
|
||||||
|
fgvtZZqJ1hK6dTyTf4oROUjPD8RgfjDnRTTvTM1COMvwgpK+cboYAvJ4BhUsn70V
|
||||||
|
B3Gveg7++1U2ECF8YHKZGfSuWn0ajT5RzdgRXTveGAINiW4G98oyXnOVhRHmXo9i
|
||||||
|
8T/41afy4xhUbNCRsaAApFjS6y8xrpGtrOcpw0u3y3T/bjYHq8VDi4ttYWIF8hJD
|
||||||
|
HPo44+SDj0g9lr/UPQDWXaiZjdD6xdioUqnHnaAdyOPPf5D6C5I7WIQPPIjnJ1yc
|
||||||
|
PmQkIV4rtb+e7cWrGbnd9stCBZ2F+HcORfjgnJzKI5asy9rmdWPIIHkcZoPFZ/K8
|
||||||
|
2ZWXUVgAZvwzcFxSjh5uXKvkOgYixdVLRfa88+KM++vwz0y3O5naq3d1SaLxV4dk
|
||||||
|
mRifLNhF9y2MKjX0bZ86Wm74NlhGGQSnUuUHpPLSA6McVOfleN/yJ9gMsosxUc9U
|
||||||
|
xIsKHYn8gN0lPVtyTSBTomK6kxoKJXxia50x/XAhJwI9X3ydLg==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
10
secrets/cloudstorage.age
Normal file
10
secrets/cloudstorage.age
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBaT3h1
|
||||||
|
K28zWlE3N3BMdHRFaldkZ0F2YVZjT3kxK2dpV1RxZUVOSElsbkdJCnF2M1ZkUWky
|
||||||
|
cGtPaXdzMmU1cllsWWtQK3R4Z0xhUExxSW9xUVh3eUo5RjQKLT4geHEtZ3JlYXNl
|
||||||
|
IEQ5JWBWM0QKS1N5WlpnbEtLTFNxQVFvbkVEa1BOTDhQRDV0SDhsdWFEdE5xMDRa
|
||||||
|
b3loMDZEeGZTZ1NzaFM5UlZYT0NjMHVvWAordjh4cFhnb2pOc3JPZlFLbFU0eC9O
|
||||||
|
WWFFVlUKLS0tIEJnMm9LM09KQ3VXNXpNNU1kS3V5VDNOTGozdDdGdWQxcFc3Mk5j
|
||||||
|
R0p0WVkKIX6p7MGDZOxS5qVgYs5K5sKC31IPIEMaWAqA5Gygegj5rVnKtN/jn7+9
|
||||||
|
L5CBbzaSXzNwRce0WPVi0mQp56lL12mRlXXamOx/E9Q+r2rznFYdQA==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
@@ -1,36 +1,42 @@
|
|||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBWNEpt
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBMNTFJ
|
||||||
cGFNeVBBaDRqb3pLSEZGQW0wb3VmVnBoZCswUFkzbnBLUnJ0QTNrClRqVkk4RUVO
|
N1Q3eXhyZFliWXRhbStOQW1SZTR5UWlIcFVtS3FEUWFLWlpnbGwwCkoxUzZhckNV
|
||||||
d29KYjd5YUcwankvaTFmVHUxQVpDT2ZYWHRaY3JXTUtQMU0KLT4gKXBtQ3UsXi1n
|
aUlpYUZTYU1wd0dtMy9Malo1ZmxvTXFMeU4yemYydmtNKzAKLT4gJn53LDswXzQt
|
||||||
cmVhc2UgNnwxYCBXVyA/KCQmIHt9NAo3OTZVUHR2UXkvaEFwY0ZBdEJsaFpsbHJ0
|
Z3JlYXNlIG4oRW0gPE5cWiBaaVpkWSUgO1xTSGkKenhuUGpxV0xpUTFZNlRqeWlF
|
||||||
cklKcDVHcEdWMEdPSkpnN0FiRU43RW5hUWFMdjR3WFRRSFBLSGlmClM3cTNJWlNM
|
N1JaSUd5a0hWVgotLS0gQnZ6U2RjZHcvWTRTYklYd0tjNEJjc2xUYXNOMEFodm9t
|
||||||
TExkdHdXUHJISkNIaE1TTUxUc1NUWkV1a09HeFU3bVZwQXMKLS0tIGhOcXFTUElS
|
NmZFcXhLQmxmZwp99f6PvpVh5VdcZvY56M0W/wCT9yWAGwV5kAJo625aFKUEDiDL
|
||||||
azJJNnEreUhMWTJBaVZGSTJPRUFqQkVYS01KRENUVVpZSDgK8+8onFejroBo7MeO
|
gybuE9ycCJ6Yk708YMRuCo8wlUF5Gd8uJuaXl2BX4450yVG7CQQbfK+zMpawvvmN
|
||||||
dW+so4lOsq4zJKn3f0cxmCFg1f0X8zt6h4Uc3A5Cvr1uU+6yw1FWmJ7xa3jJz3lO
|
5caZW+s3SjtlxR76qQP4UbrAmnrUnXSR3HGqwNSoYjWRg7vdLuUFam+un+B/auew
|
||||||
EEaKQJXYC+xIIKGcA7qILa0SFp4a/4OuYjcg27HrlPhg7u5wDhQrd0LdVEe1Xngp
|
g26RbsTC3CtBu3m7ELj61atZ2xBmx8KNrBFyzpy2HN/gZcys9IYxd8dU+M98yK1s
|
||||||
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
|
||||||
Qjv0Z1gMA+tsuBbVszwsMfneZ5+B9Q==
|
YrOzh2HNvp0e2/fKkYi7LwnPNn3Wrevp4+3aK+BztaJ7JWFFVdx8C30rt0hIMfDu
|
||||||
|
2uc08RLuGBlcbPgLFzj+60OG+M+P+Ib8uCcPGfPnovft2Y2OSUf6yS1GylPSORDP
|
||||||
|
wsNEwCMd/q1cUKy263SBqypPOwViFBItT8fkpXrm+aBhjse9NDQ3r0LLwaLtN0r+
|
||||||
|
+PCvnVa2pjx4EBudYdkahWlCBEHVYFpgR9It/rXyRxJbL3lB6UvrMv+CQeu78MYW
|
||||||
|
Mk1M0uPchpXvLG3AHVF5hReYOjsi//76Fw9Mvl9uRJwja3swKw3sjFlovnnREGbm
|
||||||
|
Lj0KqyiJ7rh0rDNywYyq2PsVk7LjyQXwFq5J/8azo06oXG8FvNGkJ5R5n2hiEshM
|
||||||
|
dBBnVsOXpRqK/EZnKjb/Rfg=
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|||||||
19
secrets/homeautomation.age
Normal file
19
secrets/homeautomation.age
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBOSk9J
|
||||||
|
RDF0bk4zNmdWRXhFTU1xUlVKeDJkTU51UDRiNjcvWlVKT3cxNzBvCk00ZEtMdlI2
|
||||||
|
L2xiS3BnT1g0aEd3VmgydCtSVERrTjNraHNmSHZicENLODAKLT4gI0crX0A0Zmst
|
||||||
|
Z3JlYXNlIE8wNCBfPz5uSy4KSGxzcnJlM1FRamI0VWlZbTJvRnRuanlwSjN0eisy
|
||||||
|
bnlHSDZZbHpIbGNZUngvS1Fqb2dzd1p6UjZKZGowOUhONgoKLS0tIE1NMUV3QlpV
|
||||||
|
dEFXMUVOTFBGSlpVSjFzRlpjVTk2dkx1VURUaFl3R014a2cKTnWIRQg4txvZZ4A5
|
||||||
|
XdwnXZqmYzOX7l2UrjmP/TJA++EURZzYtTS+q3FV9QTIj+7k0DOLf9nKq7XHlGM8
|
||||||
|
Ptkaf/s1Ly7ke+v9l9C2uf9oNI6b+m3d7QqZC5WWvRXWvl9ImaJ3xVi9AM5f5NWH
|
||||||
|
Likn6GZDir4ihAec8pAi3H2SCCjkhqF/TlLe99tp+7AAUiOjNuNlej1OUOmJNxEr
|
||||||
|
GnHePwZZqa6/F9YnYQ0tKKRsZH5whxUPYUwhHSuWa/NidBK7lqKqdaPBevfdqWLg
|
||||||
|
59gkaL9BeGG5FUXg1cPEWAvOQ5Ajae/kVH6aRi5LXJPZfA/DetWgm9mmxJ2qPpFD
|
||||||
|
/n/JCsQUOnpk66j38bWMW5uok51s61oG1OZWGpPYstoLtivKOlVpG7xgioGqIIuc
|
||||||
|
c2ZsKK/iCauwX3sGQtpX9DbILrtOnzxU2B/dclcXe2EDfSJH0u2RrefxcqPG87pI
|
||||||
|
BAosRdq7GUUISSCTccaswwG555a7/Z5gzXOwXeQYNlK1HRnkF9oBsKTUoAI2b+VO
|
||||||
|
Hdv1uw9u5JLcZt+5qSB6AxJuk8yDF0KXIqkaCiwl2fV3bBkehPru7oCJFTtVMFVZ
|
||||||
|
u0A0h+n8KJCvyRKe/Tl+lT+JHM6Mk7SkFrmsaepZPnAtfLht+bP6b0oHrUsVx/iI
|
||||||
|
r7o=
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
12
secrets/network.age
Normal file
12
secrets/network.age
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBVMEhO
|
||||||
|
RWdybFg4VWJaMjRWYm1ac2pzZ3R5aFZEM1o4dUtFZ0M4QnVKRzIwCnNGRFRjb01X
|
||||||
|
QU5mQTRSb21MV3lMMERIMGI1RHFQVFFZNlVlMnk4aTdna1kKLT4gM24xLWdyZWFz
|
||||||
|
ZSA/bVhubQplcXNVN3kxOEpqY2hUbkV3MG5PNVJtRGhORVVLdFVCRnFFVjRneEFI
|
||||||
|
VWFyZTRNS280RXlnckJpdFR4V1NBSTUzCjlxZkZ3UllpZXUwczR0T3JGRzUzMEhV
|
||||||
|
U1hobC84eWtEWWZOYyt6M2c3OUZIUTlKTm41dVp5UEZVSmVwWHBmR00KCi0tLSBF
|
||||||
|
ZnJ5QzN2VXpsY3JQQ3lmbklxcldydm1MSlFlejJ2S3hVVUtka0hTM044CvqhtnFn
|
||||||
|
pZsgP6w5uKh9CtVQpcyST8hA9P24e1opfu1JN3m/8g9XiJrMT5qVYtUXkV+pr4s6
|
||||||
|
pVGsp9KScaS0T8TpLxvZoUAAdvVtdHh6GSbbszR6gZbStbWXmb6THYKHOghpK9HD
|
||||||
|
cDEoRmzcmFdwi3m26Xppmi2R6NmeKI4S6pbY95bfh2E6jn+7
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
@@ -11,4 +11,8 @@ in
|
|||||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||||
|
"ai.age".publicKeys = authorizedKeys;
|
||||||
|
"cloudstorege.age".publicKeys = authorizedKeys;
|
||||||
|
"homeautomation.age".age".publicKeys = authorizedKeys;
|
||||||
|
"network.age".age".publicKeys = authorizedKeys;
|
||||||
}
|
}
|
||||||
|
|||||||
12
secrets/tak.age
Normal file
12
secrets/tak.age
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBsYXVu
|
||||||
|
Sk5CSjNsbHBRZkNXUGZVeGNva3FKMUdHV0RiQzJLNHVvSHZzd0dRClNnbzZvUFFR
|
||||||
|
Ty96OXZ4R2lCMHpnclpVaEZ1TEYvb0tTSVRwdWV1amdIL0UKLT4gYTtvOmAtZ3Jl
|
||||||
|
YXNlICk5WkE7USUgSyRLCjBmTWRTdEJJV2lNbVRlL3VidmZza1NTTWhIcG1vVFY5
|
||||||
|
OUUxcG4ycTMraUUKLS0tIEVlaUdlcUFPMkZSMUpJVEFzTksrVC9lZGlMNEJ1SFBv
|
||||||
|
SFNtc0wwQ05nQ0EKYlRGYGeKlfW0lTPdpCtcTfh2NWUuyZnDFe6VAWLYL3PW42od
|
||||||
|
a+bhlgxTi9KF5FLjVA3IIdQSsKiMya+PI0VfOLWkA24ZN+4uilsQkicxnnRR1z8o
|
||||||
|
hv9G8N3eYqBsLylg8rW2Xkn4RzT/S5TyJZPFG4HsUYWtHS+iomg4HbQrgIrpIde9
|
||||||
|
Th3V8WQB1HfKs9ilg8Q/DvDckFjevWYz2OXMYx4ZHWS53huQfE/oWPZfQid6Dd06
|
||||||
|
NXcvCHPVDUszhWvcoOsSpK6vaOnuY1B32/qExw==
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
Reference in New Issue
Block a user