Compare commits
23 Commits
feat/add-u
...
5c481d664a
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c481d664a | |||
| 94a7c7195a | |||
| cf279c4fb0 | |||
| b9289a149d | |||
| e0068260cb | |||
| a42b2ff65d | |||
| 92bcf1cc04 | |||
| 7d0b72a513 | |||
| 48245518a1 | |||
| 1673a56439 | |||
| 4cceab05d0 | |||
| bcebf18676 | |||
| 0370d784a0 | |||
| 260b2d2756 | |||
| 2477acdfc7 | |||
| 81c25d3f20 | |||
| 9b1f467db9 | |||
| 65fa778b2b | |||
| 5d3bbe99f3 | |||
|
|
bcf5cadaa0 | ||
| 3e04ccc1e8 | |||
| 21bd4bb283 | |||
| 7994aad8d8 |
@@ -5,6 +5,7 @@ This document outlines the development conventions for this NixOS-based infrastr
|
||||
## Build & Deployment
|
||||
|
||||
- **Build/Deploy:** Use `nixos-rebuild switch --flake .#<hostname>` to build and deploy the configuration for a specific host.
|
||||
- **CRITICAL — Validate before pushing:** Always `nix build --no-link '.#nixosConfigurations.<hostname>.config.system.build.toplevel'` (or `nh os build`) and confirm it succeeds before pushing any changes. Never push untested NixOS configs.
|
||||
- **Development Shell:** Activate the development environment with `nix develop`.
|
||||
|
||||
## Linting & Formatting
|
||||
|
||||
Submodule assets/compose updated: fb0f2cbe84...bc49391b4f
@@ -36,7 +36,7 @@
|
||||
"transparent_hugepage=always" # because mucho ram
|
||||
];
|
||||
# 2. Load the specific drivers found by sensors-detect
|
||||
boot.kernelModules = [ "nct6775" "lm96163" ];
|
||||
boot.kernelModules = [ "nct6775" "lm96163" "iptable_nat" "iptable_filter" ];
|
||||
# 3. Force the nct6775 driver to recognize the chip if it's stubborn
|
||||
boot.extraModprobeConfig = ''
|
||||
options nct6775 force_id=0xd280
|
||||
@@ -49,6 +49,27 @@
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
networking.hostId = "deadbeef";
|
||||
|
||||
# WireGuard VPN client -- always up, connects to wg-easy server
|
||||
# Create age-encrypted secrets before deploying (run on the host):
|
||||
# echo -n "<private_key>" | agenix -e secrets/wireguard_private_key.age
|
||||
# echo -n "<preshared_key>" | agenix -e secrets/wireguard_preshared_key.age
|
||||
networking.wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.8.0.3/24" ];
|
||||
privateKeyFile = config.age.secrets.wireguard_private_key.path;
|
||||
peers = [
|
||||
{
|
||||
publicKey = "rY9zII3AOm8rog2rv02PyA3Bq7zdvTOGkZapfCV1DkE=";
|
||||
presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
|
||||
allowedIPs = [ "10.8.0.0/24" ];
|
||||
endpoint = "vpn.lazyworkhorse.net:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
dns = [ "1.1.1.1" "8.8.8.8" ];
|
||||
};
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Montreal";
|
||||
|
||||
@@ -158,7 +179,7 @@
|
||||
settings = {
|
||||
PasswordAuthentication = false;
|
||||
KbdInteractiveAuthentication = false;
|
||||
PermitRootLogin = "prohibit-password";
|
||||
# Additional hardening settings below in SERVER HARDENING section
|
||||
};
|
||||
hostKeys = [
|
||||
{
|
||||
@@ -221,6 +242,11 @@
|
||||
path = self + "/assets/compose/homepage";
|
||||
};
|
||||
|
||||
vpn = {
|
||||
path = self + "/assets/compose/vpn";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
# tak = {
|
||||
# path = self + "/assets/compose/tak";
|
||||
# };
|
||||
@@ -264,6 +290,20 @@
|
||||
mode = "0440";
|
||||
path = "/run/secrets/openclaw_gateway_token";
|
||||
};
|
||||
wireguard_private_key = {
|
||||
file = ../../secrets/wireguard_private_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
path = "/run/secrets/wireguard_private_key";
|
||||
};
|
||||
wireguard_preshared_key = {
|
||||
file = ../../secrets/wireguard_preshared_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
path = "/run/secrets/wireguard_preshared_key";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -308,6 +348,196 @@
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# =============================================================================
|
||||
# SERVER HARDENING - Firewall, Fail2ban, SSH, Kernel
|
||||
# =============================================================================
|
||||
|
||||
# Firewall - default deny, explicit allow
|
||||
networking.firewall = {
|
||||
# Enable firewall with default deny policy (NixOS firewall denies all by default)
|
||||
enable = true;
|
||||
allowPing = true;
|
||||
|
||||
# Only essential ports exposed to internet
|
||||
allowedTCPPorts = [
|
||||
2424 # SSH (non-standard port)
|
||||
2222 # Gitea (version control)
|
||||
80 # HTTP (Traefik redirect)
|
||||
443 # HTTPS (Traefik)
|
||||
# 8000 # Portainer - REVIEW: internal only?
|
||||
# 4242 # Coms - REVIEW: internal only?
|
||||
# 5000 # TAK API - REVIEW: internal only?
|
||||
# 8087 # TAK Connect - REVIEW: internal only?
|
||||
# 8089 # TAK Management - REVIEW: internal only?
|
||||
];
|
||||
|
||||
allowedUDPPorts = [
|
||||
51820 # WireGuard VPN
|
||||
];
|
||||
|
||||
# Rate limiting and attack prevention
|
||||
extraCommands = ''
|
||||
# Rate limit SSH connections (max 4 new connections per 60 seconds)
|
||||
iptables -A INPUT -p tcp --dport 2424 -m state --state NEW -m recent --set
|
||||
iptables -A INPUT -p tcp --dport 2424 -m state --state NEW -m recent --update --seconds 60 --hitcount 4 -j DROP
|
||||
|
||||
# Rate limit HTTP/HTTPS (protects Traefik)
|
||||
iptables -A INPUT -p tcp --dport 80 -m state --state NEW -m limit --limit 25/minute --limit-burst 100 -j ACCEPT
|
||||
iptables -A INPUT -p tcp --dport 443 -m state --state NEW -m limit --limit 25/minute --limit-burst 100 -j ACCEPT
|
||||
|
||||
# Drop invalid packets
|
||||
iptables -A INPUT -m state --state INVALID -j DROP
|
||||
|
||||
# Log dropped packets (rate limited)
|
||||
iptables -A INPUT -m limit --limit 5/min -j LOG --log-prefix "IPTables-Dropped: " --log-level 4
|
||||
'';
|
||||
};
|
||||
|
||||
# Fail2ban - automatic IP banning
|
||||
services.fail2ban = {
|
||||
enable = true;
|
||||
maxretry = 3;
|
||||
bantime = "1h";
|
||||
banaction = "iptables-multiport";
|
||||
|
||||
jails = {
|
||||
# SSH brute force protection (uses systemd journal backend)
|
||||
sshd = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "sshd";
|
||||
port = "2424";
|
||||
maxretry = 3;
|
||||
bantime = "1h";
|
||||
};
|
||||
};
|
||||
|
||||
# Recidive - ban repeat offenders for 1 week
|
||||
recidive = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "recidive";
|
||||
logpath = "/var/log/fail2ban.log";
|
||||
bantime = "1w";
|
||||
findtime = "1d";
|
||||
maxretry = 3;
|
||||
};
|
||||
};
|
||||
|
||||
# HTTP authentication failures (Traefik)
|
||||
http-auth = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "traefik-auth";
|
||||
port = "80,443";
|
||||
logpath = "/var/log/traefik/access.log";
|
||||
maxretry = 5;
|
||||
bantime = "1h";
|
||||
};
|
||||
};
|
||||
|
||||
# HTTP scanning/attacks (Traefik)
|
||||
http-botsearch = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "traefik-botsearch";
|
||||
port = "80,443";
|
||||
logpath = "/var/log/traefik/access.log";
|
||||
maxretry = 2;
|
||||
bantime = "2h";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Custom fail2ban filters for Traefik
|
||||
environment.etc."fail2ban/filter.d/traefik-auth.conf".text = ''
|
||||
[Definition]
|
||||
failregex = ^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*" (401|403) \d+.*$
|
||||
ignoreregex =
|
||||
'';
|
||||
|
||||
environment.etc."fail2ban/filter.d/traefik-botsearch.conf".text = ''
|
||||
[Definition]
|
||||
failregex = ^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*" 404 \d+.*$
|
||||
^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*/(\.|wp-|php|admin|login|xmlrpc|\.env|\.git|\.aws|\.azure).*" \d+.*$
|
||||
ignoreregex =
|
||||
'';
|
||||
|
||||
# SSH hardening
|
||||
services.openssh.settings = {
|
||||
PermitRootLogin = "no";
|
||||
MaxAuthTries = 3;
|
||||
MaxSessions = 5;
|
||||
LoginGraceTime = 30;
|
||||
ClientAliveInterval = 300;
|
||||
ClientAliveCountMax = 2;
|
||||
PermitEmptyPasswords = "no";
|
||||
ChallengeResponseAuthentication = "no";
|
||||
UsePAM = true;
|
||||
LogLevel = "VERBOSE";
|
||||
X11Forwarding = false;
|
||||
AllowTcpForwarding = "no";
|
||||
AllowAgentForwarding = "no";
|
||||
PermitTunnel = "no";
|
||||
};
|
||||
|
||||
# Kernel network hardening
|
||||
boot.kernel.sysctl = {
|
||||
# IP Spoofing protection
|
||||
"net.ipv4.conf.all.rp_filter" = 1;
|
||||
"net.ipv4.conf.default.rp_filter" = 1;
|
||||
|
||||
# Ignore ICMP broadcasts
|
||||
"net.ipv4.icmp_echo_ignore_broadcasts" = 1;
|
||||
|
||||
# Disable source routing
|
||||
"net.ipv4.conf.all.accept_source_route" = 0;
|
||||
"net.ipv4.conf.default.accept_source_route" = 0;
|
||||
"net.ipv6.conf.all.accept_source_route" = 0;
|
||||
"net.ipv6.conf.default.accept_source_route" = 0;
|
||||
|
||||
# Disable redirects
|
||||
"net.ipv4.conf.all.send_redirects" = 0;
|
||||
"net.ipv4.conf.default.send_redirects" = 0;
|
||||
|
||||
# SYN flood protection
|
||||
"net.ipv4.tcp_syncookies" = 1;
|
||||
"net.ipv4.tcp_max_syn_backlog" = 2048;
|
||||
"net.ipv4.tcp_synack_retries" = 2;
|
||||
"net.ipv4.tcp_syn_retries" = 5;
|
||||
|
||||
# Log martian packets
|
||||
"net.ipv4.conf.all.log_martians" = 1;
|
||||
"net.ipv4.conf.default.log_martians" = 1;
|
||||
|
||||
# Ignore redirects
|
||||
"net.ipv4.conf.all.accept_redirects" = 0;
|
||||
"net.ipv4.conf.default.accept_redirects" = 0;
|
||||
"net.ipv4.conf.all.secure_redirects" = 0;
|
||||
"net.ipv4.conf.default.secure_redirects" = 0;
|
||||
"net.ipv6.conf.all.accept_redirects" = 0;
|
||||
"net.ipv6.conf.default.accept_redirects" = 0;
|
||||
|
||||
# Connection tuning
|
||||
"net.core.somaxconn" = 4096;
|
||||
"net.core.netdev_max_backlog" = 65536;
|
||||
"net.ipv4.tcp_max_orphans" = 65536;
|
||||
"net.ipv4.tcp_fin_timeout" = 15;
|
||||
"net.ipv4.tcp_keepalive_time" = 300;
|
||||
"net.ipv4.tcp_keepalive_probes" = 5;
|
||||
"net.ipv4.tcp_keepalive_intvl" = 15;
|
||||
};
|
||||
|
||||
# Audit logging
|
||||
security.auditd.enable = true;
|
||||
|
||||
# Fail2ban log directory
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/log/fail2ban 0755 root root -"
|
||||
"d /var/log/traefik 0755 root root -"
|
||||
];
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
|
||||
@@ -14,8 +14,25 @@
|
||||
local base_model=$2
|
||||
if ! ${pkgs.docker}/bin/docker exec ollama ollama list | grep -q "$model_name"; then
|
||||
echo "$model_name not found, creating from $base_model..."
|
||||
|
||||
# We use a custom TEMPLATE block to strip the 'currentDate' function
|
||||
# which is unsupported in Ollama 0.5.7 but present in Devstral's default manifest.
|
||||
${pkgs.docker}/bin/docker exec ollama sh -c "cat <<EOF > /root/.ollama/$model_name.modelfile
|
||||
FROM $base_model
|
||||
TEMPLATE \"\"\"{{- if .System }}
|
||||
[SYSTEM_PROMPT]
|
||||
{{ .System }}
|
||||
[/SYSTEM_PROMPT]
|
||||
{{- end }}
|
||||
{{- range .Messages }}
|
||||
{{- if eq .Role \"user\" }}
|
||||
[INST]
|
||||
{{ .Content }}
|
||||
[/INST]
|
||||
{{- else if eq .Role \"assistant\" }}
|
||||
{{ .Content }}
|
||||
{{- end }}
|
||||
{{- end }}\"\"\"
|
||||
PARAMETER num_ctx 131072
|
||||
PARAMETER num_predict 4096
|
||||
PARAMETER num_keep 1024
|
||||
@@ -26,6 +43,7 @@ PARAMETER stop \"[/INST]\"
|
||||
PARAMETER stop \"</s>\"
|
||||
EOF"
|
||||
${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f "/root/.ollama/$model_name.modelfile"
|
||||
${pkgs.docker}/bin/docker exec ollama rm "/root/.ollama/$model_name.modelfile"
|
||||
else
|
||||
echo "$model_name already exists, skipping."
|
||||
fi
|
||||
@@ -36,6 +54,10 @@ EOF"
|
||||
|
||||
# Create Devstral
|
||||
create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b"
|
||||
|
||||
# create_model_if_missing "qwen2.5-coder:32b-128k" "qwen2.5-coder:32b"
|
||||
|
||||
# create_model_if_missing "mistral-large-planner:123b" "mistral-large:123b-instruct-v2407-q4_K_S"
|
||||
'';
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
|
||||
@@ -11,4 +11,71 @@
|
||||
];
|
||||
};
|
||||
users.groups.ai-worker = {};
|
||||
|
||||
# Restricted sudo for ai-worker - security checks only
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "ai-worker" ];
|
||||
commands = [
|
||||
# Firewall checks
|
||||
{
|
||||
command = "/run/wrappers/bin/sudo iptables -L -n -v";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/wrappers/bin/sudo iptables -S";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Fail2ban status
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client status";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client status *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client get * banned";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Log inspection
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -t kernel -n 100";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -u fail2ban -n 50";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -u firewall -n 50";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# SSH config verification
|
||||
{
|
||||
command = "/run/current-system/sw/bin/sshd -T";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Docker service checks
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker ps";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker inspect *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Network diagnostics
|
||||
{
|
||||
command = "/run/current-system/sw/bin/ss -tlnp";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/cat /proc/net/tcp";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user