Compare commits
127 Commits
b92ca00054
...
fix/honcho
| Author | SHA1 | Date | |
|---|---|---|---|
| 15f70019d5 | |||
| e216c8edac | |||
| 2b4b2e2216 | |||
| 6be4076372 | |||
| 690873d0e4 | |||
| cd817c7fd2 | |||
| 33d1d860fb | |||
| 8d7afecb6e | |||
| 6f18071198 | |||
| b43c6794b3 | |||
| 8b9a144254 | |||
| db2bd1d157 | |||
| 36359de6aa | |||
|
|
10b8565fd6 | ||
|
|
f672696b8e | ||
| 0980dca455 | |||
| 96bc20ab70 | |||
| 670ae4f002 | |||
| f785abfd49 | |||
| 6f44aa7f76 | |||
| 8d40f1691f | |||
|
|
2dd2e64986 | ||
|
|
23fc5e0597 | ||
| 0c9c33d735 | |||
| 0bb6890f1c | |||
| 9d5434425f | |||
| 1fb4320dd1 | |||
| 51e9f47fd4 | |||
| 06b3eb840f | |||
| 28ab52209c | |||
|
|
e6f7f0c263 | ||
|
|
5c136e0765 | ||
|
|
f722af7803 | ||
|
|
c07debf088 | ||
| 6806898f04 | |||
| 96e77c5ef2 | |||
| ff7303cf6a | |||
| 9e42f5d2cc | |||
| 614883f3c3 | |||
| 374d022593 | |||
| 9679846cdb | |||
| 4056f91ec6 | |||
| 1ba7d31d2f | |||
| c7e9f8a1e0 | |||
| bbe1a4a850 | |||
| 2b8316060c | |||
| cc2c62faf7 | |||
| 47f1ba6cf2 | |||
| db89881d75 | |||
| 0bb0a270e6 | |||
| 41256ccbde | |||
| e551f0e5c5 | |||
| b11d599f37 | |||
| 782f2fa9ed | |||
| 2e14069584 | |||
| c53460c400 | |||
|
|
ee96593e3d | ||
|
|
030125ab01 | ||
|
|
5935747902 | ||
|
|
9ae0f6ad62 | ||
| 5c481d664a | |||
| 94a7c7195a | |||
| cf279c4fb0 | |||
| b9289a149d | |||
| e0068260cb | |||
| a42b2ff65d | |||
| 92bcf1cc04 | |||
| 7d0b72a513 | |||
| 48245518a1 | |||
| 1673a56439 | |||
|
|
7d3d072961 | ||
| 4cceab05d0 | |||
| bcebf18676 | |||
| 0370d784a0 | |||
| 260b2d2756 | |||
| 2477acdfc7 | |||
| 81c25d3f20 | |||
| 9b1f467db9 | |||
| 65fa778b2b | |||
| 5d3bbe99f3 | |||
|
|
bcf5cadaa0 | ||
| 3e04ccc1e8 | |||
| 21bd4bb283 | |||
| 7994aad8d8 | |||
| f0e21d95e4 | |||
| 18df45819d | |||
| 7efba3ac5b | |||
|
|
cf1373cd68 | ||
|
|
bc875ef9fb | ||
|
|
c579b07843 | ||
|
|
d3f50cdadc | ||
|
|
8aa85e62e5 | ||
|
|
b9cf8a47f7 | ||
|
|
2e749228bb | ||
|
|
ce20fad4d3 | ||
|
|
401b23ce46 | ||
| 13dbf18f67 | |||
| 58f7dd65f1 | |||
| a4390fabcc | |||
| bb40ded253 | |||
| 0845262c05 | |||
| b59f8952ac | |||
| 515fe8a830 | |||
| 056c39aa71 | |||
| 71dfd04108 | |||
| d92e1426ba | |||
| 9531bff929 | |||
| 0b4e9e092d | |||
| 46ac5a72d0 | |||
| b77de4e384 | |||
| 85fd05c6cf | |||
| b54760f62b | |||
| 1210a44ecc | |||
| e2b040e5f0 | |||
| f5b3a04378 | |||
| a4c5a10c4f | |||
| b8a8e1bdce | |||
| 40a48eb605 | |||
| 266f563c2f | |||
| a49c4f40e5 | |||
| a8851c19e4 | |||
| 3497d93dcb | |||
| 955c3255a0 | |||
| 6b367a7c95 | |||
| 02155976ab | |||
| 4c7f22b903 | |||
| f0f7c2613e |
59
.planning/PROJECT.md
Normal file
59
.planning/PROJECT.md
Normal file
@@ -0,0 +1,59 @@
|
||||
# NixOS Infrastructure with AI Assistant
|
||||
|
||||
## What This Is
|
||||
|
||||
This project manages a NixOS-based infrastructure with Docker services, integrated with OpenCode AI assistant for automated management. The system supports:
|
||||
|
||||
- Reproducible NixOS infrastructure configuration
|
||||
- Docker service management via Docker Compose
|
||||
- AI-assisted infrastructure operations
|
||||
- Automatic service deployment and lifecycle management
|
||||
- Integration with existing Docker stacks (ai, cloudstorage, homeautomation, network, passwordmanager, versioncontrol)
|
||||
|
||||
## Core Value
|
||||
|
||||
The core value is a **reproducible and evolvable NixOS infrastructure** that can be managed through natural language interactions with the OpenCode AI assistant. The system should automatically detect and integrate new Docker services while maintaining consistency across all deployments.
|
||||
|
||||
## Requirements
|
||||
|
||||
### Validated
|
||||
|
||||
- NixOS configuration management with flakes
|
||||
- Docker service integration via docker_manager.nix
|
||||
- Traefik reverse proxy with automatic TLS certificates
|
||||
- Environment variable management via agenix secrets
|
||||
- Standardized service patterns across all Docker stacks
|
||||
|
||||
### Active
|
||||
|
||||
- [ ] Automatic detection and integration of new Docker Compose files in `assets/compose/`
|
||||
- [ ] AI assistant integration for service lifecycle management
|
||||
- [ ] Service health monitoring and logging verification
|
||||
- [ ] Documentation of integration patterns in SKILL.md
|
||||
- [ ] Automated system update workflow (`nh os switch`)
|
||||
|
||||
### Out of Scope
|
||||
|
||||
- Full n8n integration for automated workflows - deferring to future milestone
|
||||
- Self-healing infrastructure with automatic problem detection - future enhancement
|
||||
- Multi-host orchestration - single-host focus for v1
|
||||
|
||||
## Key Decisions
|
||||
|
||||
| Decision | Rationale | Outcome |
|
||||
|----------|-----------|---------|
|
||||
| NixOS with Flakes | Reproducible infrastructure, better dependency management | Good |
|
||||
| Docker Compose integration | Preserves existing service configurations, flexibility | Good |
|
||||
| agenix for secrets | Secure secrets management, Nix native integration | Good |
|
||||
| Traefik reverse proxy | Unified HTTPS entrypoint, automatic certificate management | Good |
|
||||
| Standardized service patterns | Consistency across services, easier maintenance | Pending |
|
||||
|
||||
## Context
|
||||
|
||||
- **Existing Services**: ai (Llama.cpp, Open WebUI, n8n), cloudstorage (Nextcloud), homeautomation (Home Assistant), network (Traefik, DDNS), passwordmanager (Vaultwarden), versioncontrol (Gitea)
|
||||
- **Tech Stack**: NixOS unstable, Docker, Docker Compose, Traefik, agenix, OpenCode AI
|
||||
- **Hardware**: AMD MI50 GPUs for AI workloads
|
||||
- **Network**: Traefik-net bridge network for all services
|
||||
- **Storage**: `/mnt/HoardingCow_docker_data/<service>` for persistent data
|
||||
|
||||
**Last updated: 2026-01-01 after init**
|
||||
147
.planning/ROADMAP.md
Normal file
147
.planning/ROADMAP.md
Normal file
@@ -0,0 +1,147 @@
|
||||
# Roadmap: NixOS Infrastructure with AI Assistant
|
||||
|
||||
## Overview
|
||||
|
||||
This roadmap outlines the implementation of a reproducible NixOS infrastructure with Docker service management, integrated with an AI assistant for automated operations. The system will automatically detect and integrate new Docker services while maintaining consistency across deployments.
|
||||
|
||||
## Domain Expertise
|
||||
|
||||
None
|
||||
|
||||
## Phases
|
||||
|
||||
- ✅ **Phase 1: Foundation Setup** - Establish core NixOS configuration with flakes
|
||||
- ✅ **Phase 2: Docker Service Integration** - Integrate Docker Compose services
|
||||
- ✅ **Phase 3: AI Assistant Integration** - Enable AI-assisted infrastructure management
|
||||
- [ ] **Phase 4: Internet Access & MCP** - MCP server for web access
|
||||
|
||||
|
||||
## Phase Details
|
||||
|
||||
### Phase 1: Foundation Setup
|
||||
**Goal**: Establish the core NixOS configuration with flakes and basic infrastructure
|
||||
**Depends on**: Nothing (first phase)
|
||||
**Research**: Unlikely (established Nix patterns)
|
||||
**Plans**: 3 plans
|
||||
**Status**: Complete
|
||||
|
||||
Plans:
|
||||
- [x] 01-01: Set up NixOS flake structure with hardware configuration
|
||||
- [x] 01-02: Configure basic services and networking
|
||||
- [x] 01-03: Implement secrets management with agenix
|
||||
|
||||
### Phase 2: Docker Service Integration
|
||||
**Goal**: Integrate Docker service management with Traefik reverse proxy
|
||||
**Depends on**: Phase 1
|
||||
**Research**: Unlikely (existing Docker Compose patterns)
|
||||
**Plans**: 3 plans
|
||||
**Status**: Complete
|
||||
|
||||
Plans:
|
||||
- [x] 02-01: Implement docker_manager.nix for service integration
|
||||
- [x] 02-02: Configure Traefik reverse proxy with automatic TLS
|
||||
- [x] 02-03: Set up persistent storage for Docker services
|
||||
|
||||
### Phase 3: AI Assistant Integration
|
||||
**Goal**: Enable AI assistant to manage infrastructure operations
|
||||
**Depends on**: Phase 2
|
||||
**Research**: Likely (AI integration patterns)
|
||||
**Research topics**: OpenCode AI API, infrastructure management patterns, natural language parsing for service operations
|
||||
**Plans**: 2 plans
|
||||
**Status**: Complete
|
||||
|
||||
Plans:
|
||||
- [x] 03-01: Integrate OpenCode AI assistant with NixOS configuration
|
||||
- [x] 03-02: Implement natural language command parsing
|
||||
|
||||
### Phase 4: Internet Access & MCP
|
||||
**Goal**: Set up MCP server for web access and enhanced functionality
|
||||
**Depends on**: Phase 3
|
||||
**Research**: Likely (MCP server configuration)
|
||||
**Research topics**: MCP server setup, web access integration, security considerations
|
||||
**Plans**: 2 plans
|
||||
|
||||
Plans:
|
||||
- [x] 04-01: Configure MCP server for external access
|
||||
- [x] 04-02: Test web search capabilities and integration
|
||||
|
||||
### Phase 4.1: Organize Accumulated Commits (INSERTED)
|
||||
|
||||
**Goal**: Organize uncommitted changes into logical, meaningful commits
|
||||
**Depends on**: Phase 4
|
||||
**Status**: Complete
|
||||
**Plans**: 5 plans
|
||||
|
||||
Plans:
|
||||
- [x] 04-01: Stage Docker stack integration files
|
||||
- [x] 04-02: Commit system configuration improvements
|
||||
- [x] 04-03: Update service modules and remove deprecated systemd services
|
||||
- [x] 04-04: Add n8n-worker user and update authentication
|
||||
- [x] 04-05: Update flake imports and infrastructure secrets
|
||||
|
||||
**Details**:
|
||||
Successfully organized accumulated changes into 5 logical commits:
|
||||
1. Docker stack integration with improved service management
|
||||
2. System configuration enhancements (hardware sensors, GPU support, security)
|
||||
3. Service module updates and cleanup of deprecated systemd services
|
||||
4. User and authentication configuration updates
|
||||
5. Flake and infrastructure updates
|
||||
|
||||
### 🚧 v5.0 TAK Server (In Progress)
|
||||
|
||||
**Milestone Goal:** Add TAK (Tactical Assault Kit) server with web interface for team coordination and offsite operator integration
|
||||
|
||||
#### Phase 5: TAK Server Research & Selection
|
||||
|
||||
**Goal**: Research and select the optimal TAK-compatible server with web interface
|
||||
**Depends on**: Previous milestone complete
|
||||
**Research**: Likely (comparing different TAK implementations)
|
||||
**Research Method**: Use DuckDuckGo tool for web research
|
||||
**Research topics**: Open-source TAK-compatible servers with web UIs, COT protocol support, geospatial mapping, deployment requirements, security considerations
|
||||
**Plans**: TBD
|
||||
|
||||
Plans:
|
||||
- [ ] 05-01: Research TAK-compatible open-source implementations
|
||||
- [ ] 05-02: Compare features and select optimal solution
|
||||
- [ ] 05-03: Document research findings and recommendations
|
||||
|
||||
#### Phase 6: TAK Server Implementation
|
||||
|
||||
**Goal**: Implement TAK server as Docker service with Traefik integration
|
||||
**Depends on**: Phase 5 (research completed)
|
||||
**Research**: Unlikely (following established Docker patterns)
|
||||
**Plans**: TBD
|
||||
|
||||
Plans:
|
||||
- [ ] 06-01: Create Docker Compose configuration
|
||||
- [ ] 06-02: Set up persistent storage and Traefik routing
|
||||
- [ ] 06-03: Integrate with docker_manager.nix module
|
||||
|
||||
#### Phase 7: TAK Server Testing & Validation
|
||||
|
||||
**Goal**: Validate TAK server functionality and integration
|
||||
**Depends on**: Phase 6 (implementation complete)
|
||||
**Research**: Unlikely
|
||||
**Plans**: TBD
|
||||
|
||||
Plans:
|
||||
- [ ] 07-01: Test COT protocol functionality
|
||||
- [ ] 07-02: Verify web interface and geospatial features
|
||||
- [ ] 07-03: Validate security and integration
|
||||
|
||||
|
||||
|
||||
## Progress
|
||||
|
||||
**Execution Order:**
|
||||
Phases execute in numeric order: 1 → 2 → 3 → 4 → 5 → 6 → 7
|
||||
|
||||
| Phase | Milestone | Plans Complete | Status | Completed |
|
||||
|-------|-----------|----------------|--------|-----------|
|
||||
| 1. Foundation Setup | v1.0 | 3/3 | Complete | - |
|
||||
| 2. Docker Service Integration | v1.0 | 3/3 | Complete | - |
|
||||
| 3. AI Assistant Integration | v1.0 | 2/2 | Complete | - |
|
||||
| 4. Internet Access & MCP | v1.0 | 2/2 | Complete | - |
|
||||
| 5. TAK Server Research | v5.0 | 0/3 | Not started | - |
|
||||
| 6. TAK Server Implementation | v5.0 | 0/3 | Not started | - |
|
||||
| 7. TAK Server Testing | v5.0 | 0/3 | Not started | - |
|
||||
83
.planning/STATE.md
Normal file
83
.planning/STATE.md
Normal file
@@ -0,0 +1,83 @@
|
||||
# Project State
|
||||
|
||||
## Project Reference
|
||||
|
||||
**Core Value:** A reproducible and evolvable NixOS infrastructure that can be managed through natural language interactions with the OpenCode AI assistant
|
||||
**Current Focus:** Complete Phase 4.1 (Organize Accumulated Commits) and prepare for Phase 4.2
|
||||
|
||||
## Current Position
|
||||
|
||||
Phase: 5 of 7 (TAK Server Research & Selection)
|
||||
Plan: 1 of 3 complete
|
||||
Status: In progress - Phase 5.1 research completed
|
||||
Last activity: 2026-01-01 - Completed 05-01 research plan
|
||||
|
||||
Progress: ▓▓▓▓▓▓█ 90%
|
||||
|
||||
## Performance Metrics
|
||||
|
||||
**Velocity:**
|
||||
- Total plans completed: 14 (13 previous + 1 new)
|
||||
- Average duration: 0 min
|
||||
- Total execution time: 0.0 hours
|
||||
|
||||
**By Phase:**
|
||||
|
||||
| Phase | Plans | Total | Avg/Plan |
|
||||
|-------|-------|-------|----------|
|
||||
| 1-3 | 8/8 | 8 | 0 |
|
||||
| 4.1 | 5/5 | 5 | 0 |
|
||||
| 4.2 | 2/2 | 2 | 0 |
|
||||
| 5 | 1/3 | 1 | 10 min | 0 |
|
||||
| 6-7 | 0/6 | 0 | N/A |
|
||||
|
||||
**Recent Trend:**
|
||||
- Last 5 plans: []
|
||||
- Trend: [Not available for new phases]
|
||||
|
||||
## Accumulated Context
|
||||
|
||||
### Decisions Made
|
||||
|
||||
| Phase | Decision | Rationale |
|
||||
|-------|----------|-----------|
|
||||
| 1-3 | All phases completed | Foundational infrastructure in place |
|
||||
| 4 | Removed entirely | Not needed per user request |
|
||||
|
||||
### Deferred Issues
|
||||
|
||||
None yet.
|
||||
|
||||
### Roadmap Evolution
|
||||
|
||||
- Phase 4.1 inserted after Phase 4: Organize accumulated commits logically (URGENT)
|
||||
- Status: Complete
|
||||
- Completion: 2026-01-01
|
||||
- Result: 5 logical commits created from accumulated changes
|
||||
- Reason: Accumulated uncommitted changes need logical grouping before Phase 4 execution
|
||||
|
||||
### Blockers/Concerns Carried Forward
|
||||
|
||||
None yet.
|
||||
|
||||
## Session Continuity
|
||||
|
||||
Last session: 2026-01-01 23:15
|
||||
Stopped at: Phase 5.1 research completed - OpenTAKServer selected
|
||||
Resume file: None
|
||||
|
||||
**Next Phase**: 5.2 - Compare features and select optimal solution
|
||||
|
||||
## Accumulated Context
|
||||
|
||||
### Decisions Made
|
||||
|
||||
| Phase | Decision | Rationale |
|
||||
|-------|----------|-----------|
|
||||
| 1-3 | All phases completed | Foundational infrastructure in place |
|
||||
| 4 | Removed entirely | Not needed per user request |
|
||||
| 5.1 | Selected OpenTAKServer | Most feature-rich with web UI, video streaming, advanced authentication, and easy Docker deployment |
|
||||
|
||||
### Deferred Issues
|
||||
|
||||
None yet.
|
||||
17
.planning/config.json
Normal file
17
.planning/config.json
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"mode": "interactive",
|
||||
"gates": {
|
||||
"confirm_project": true,
|
||||
"confirm_phases": true,
|
||||
"confirm_roadmap": true,
|
||||
"confirm_breakdown": true,
|
||||
"confirm_plan": true,
|
||||
"execute_next_plan": true,
|
||||
"issues_review": true,
|
||||
"confirm_transition": true
|
||||
},
|
||||
"safety": {
|
||||
"always_confirm_destructive": true,
|
||||
"always_confirm_external_services": true
|
||||
}
|
||||
}
|
||||
129
.planning/phases/04-internet-access/04-02-PLAN.md
Normal file
129
.planning/phases/04-internet-access/04-02-PLAN.md
Normal file
@@ -0,0 +1,129 @@
|
||||
# Phase 4: Internet Access & MCP
|
||||
|
||||
## Plan 4.2: Test Web Search Capabilities and Integration
|
||||
|
||||
### Objective
|
||||
Test and verify that the OpenCode AI assistant can successfully perform web searches through the configured MCP servers.
|
||||
|
||||
**Purpose:** Ensure the web search functionality is working correctly and integrate it with the AI assistant's capabilities.
|
||||
|
||||
**Output:** Test results confirming web search functionality through MCP servers and documentation of the integration.
|
||||
|
||||
### Execution Context
|
||||
- ~/.config/opencode/gsd/workflows/execute-phase.md
|
||||
- ~/.config/opencode/gsd/templates/phase-prompt.md
|
||||
- ~/.config/opencode/gsd/references/plan-format.md
|
||||
- ~/.config/opencode/gsd/references/checkpoints.md
|
||||
|
||||
### Context
|
||||
@.planning/PROJECT.md
|
||||
@.planning/ROADMAP.md
|
||||
@.planning/phases/04-internet-access/04-01-SUMMARY.md
|
||||
@src/modules/nixos/services/open_code_server.nix
|
||||
|
||||
**Project Context:**
|
||||
- MCP servers (Context7 and DuckDuckGo) should be configured from Plan 1
|
||||
- OpenCode service needs to be running to test web search functionality
|
||||
- Testing should verify both MCP servers are functional and accessible
|
||||
|
||||
### Tasks
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 1: Start OpenCode Service</name>
|
||||
<files>None - systemd service</files>
|
||||
<action>Start the OpenCode service using systemd:
|
||||
sudo systemctl start opencode
|
||||
Ensure the service is running and check logs for any errors</action>
|
||||
<verify>systemctl status opencode shows service is active and running</verify>
|
||||
<done>OpenCode service is running without errors</done>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 2: Test Context7 Web Search</name>
|
||||
<files>None - runtime test</files>
|
||||
<action>Test web search through Context7 MCP:
|
||||
1. Use the OpenCode API to send a web search query
|
||||
2. Verify the response includes search results from Context7
|
||||
3. Check that the service properly handles the MCP communication
|
||||
Example query: "What is the current weather in New York?"</action>
|
||||
<verify>Web search through Context7 returns valid search results</verify>
|
||||
<done>Context7 web search is functional and returns expected results</done>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 3: Test DuckDuckGo Web Search</name>
|
||||
<files>None - runtime test</files>
|
||||
<action>Test web search through DuckDuckGo MCP:
|
||||
1. Use the OpenCode API to send a web search query
|
||||
2. Verify the response includes search results from DuckDuckGo
|
||||
3. Check that the service properly handles the MCP communication
|
||||
Example query: "Latest news about AI technology"</action>
|
||||
<verify>Web search through DuckDuckGo returns valid search results</verify>
|
||||
<done>DuckDuckGo web search is functional and returns expected results</done>
|
||||
</task>
|
||||
|
||||
<task type="checkpoint:human-verify" gate="blocking">
|
||||
<what-built>Web search functionality through MCP servers</what-built>
|
||||
<how-to-verify>
|
||||
1. Test web search queries through both Context7 and DuckDuckGo
|
||||
2. Verify search results are relevant and current
|
||||
3. Check that the AI assistant can properly interpret and format results
|
||||
4. Test a variety of query types (factual, news, technology)
|
||||
</how-to-verify>
|
||||
<resume-signal>Type "approved" if web search is working correctly, or describe any issues with search results or functionality</resume-signal>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 4: Document Web Search Integration</name>
|
||||
<files>Documentation in configuration or README</files>
|
||||
<action>Document the web search capabilities in the OpenCode configuration:
|
||||
1. Add comments explaining the MCP server configuration
|
||||
2. Note which MCP servers are available for web search
|
||||
3. Document any limitations or known issues with web search
|
||||
4. Provide examples of effective web search queries</action>
|
||||
<verify>Configuration file includes documentation about MCP web search capabilities</verify>
|
||||
<done>Web search integration is documented with examples and usage notes</done>
|
||||
</task>
|
||||
|
||||
### Verification
|
||||
Before declaring phase complete:
|
||||
- [ ] OpenCode service is running without errors
|
||||
- [ ] Context7 web search returns valid, relevant results
|
||||
- [ ] DuckDuckGo web search returns valid, relevant results
|
||||
- [ ] AI assistant properly interprets and formats search results
|
||||
- [ ] Web search capabilities are documented
|
||||
- [ ] No errors in service logs during web search operations
|
||||
|
||||
### Success Criteria
|
||||
- All tasks completed successfully
|
||||
- Web search functionality through both MCP servers is working
|
||||
- AI assistant can effectively use web search capabilities
|
||||
- Configuration and usage are properly documented
|
||||
- No errors or warnings introduced in the configuration
|
||||
- Phase 4 (Internet Access & MCP) is complete
|
||||
|
||||
### Output
|
||||
After completion, create `.planning/phases/04-internet-access/04-02-SUMMARY.md`:
|
||||
|
||||
# Phase 4 Plan 2: Web Search Integration Summary
|
||||
|
||||
Web search capabilities through MCP servers successfully tested and integrated.
|
||||
|
||||
## Accomplishments
|
||||
- Started OpenCode service and verified it's running
|
||||
- Tested and verified Context7 web search functionality
|
||||
- Tested and verified DuckDuckGo web search functionality
|
||||
- Human verification of web search results
|
||||
- Documented web search integration
|
||||
|
||||
## Files Created/Modified
|
||||
- `/home/gortium/infra/modules/nixos/services/open_code_server.nix` - Added documentation
|
||||
|
||||
## Decisions Made
|
||||
- No significant decisions required - testing existing configuration
|
||||
|
||||
## Issues Encountered
|
||||
- Any issues encountered during testing, along with resolutions
|
||||
|
||||
## Next Step
|
||||
Phase 4 complete. Ready to proceed to Phase 5: TAK Server Integration
|
||||
129
.planning/phases/04-internet-access/04-02-SUMMARY.md
Normal file
129
.planning/phases/04-internet-access/04-02-SUMMARY.md
Normal file
@@ -0,0 +1,129 @@
|
||||
# Phase 4: Internet Access & MCP
|
||||
|
||||
## Plan 4.2: Test Web Search Capabilities and Integration
|
||||
|
||||
### Objective
|
||||
Test and verify that the OpenCode AI assistant can successfully perform web searches through the configured MCP servers.
|
||||
|
||||
**Purpose:** Ensure the web search functionality is working correctly and integrate it with the AI assistant's capabilities.
|
||||
|
||||
**Output:** Test results confirming web search functionality through MCP servers and documentation of the integration.
|
||||
|
||||
### Execution Context
|
||||
- ~/.config/opencode/gsd/workflows/execute-phase.md
|
||||
- ~/.config/opencode/gsd/templates/phase-prompt.md
|
||||
- ~/.config/opencode/gsd/references/plan-format.md
|
||||
- ~/.config/opencode/gsd/references/checkpoints.md
|
||||
|
||||
### Context
|
||||
@.planning/PROJECT.md
|
||||
@.planning/ROADMAP.md
|
||||
@.planning/phases/04-internet-access/04-01-SUMMARY.md
|
||||
@src/modules/nixos/services/open_code_server.nix
|
||||
|
||||
**Project Context:**
|
||||
- MCP servers (Context7 and DuckDuckGo) should be configured from Plan 1
|
||||
- OpenCode service needs to be running to test web search functionality
|
||||
- Testing should verify both MCP servers are functional and accessible
|
||||
|
||||
### Tasks
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 1: Start OpenCode Service</name>
|
||||
<files>None - systemd service</files>
|
||||
<action>Start the OpenCode service using systemd:
|
||||
sudo systemctl start opencode
|
||||
Ensure the service is running and check logs for any errors</action>
|
||||
<verify>systemctl status opencode shows service is active and running</verify>
|
||||
<done>OpenCode service is running without errors</done>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 2: Test Context7 Web Search</name>
|
||||
<files>None - runtime test</files>
|
||||
<action>Test web search through Context7 MCP:
|
||||
1. Use the OpenCode API to send a web search query
|
||||
2. Verify the response includes search results from Context7
|
||||
3. Check that the service properly handles the MCP communication
|
||||
Example query: "What is the current weather in New York?"</action>
|
||||
<verify>Web search through Context7 returns valid search results</verify>
|
||||
<done>Context7 web search is functional and returns expected results</done>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 3: Test DuckDuckGo Web Search</name>
|
||||
<files>None - runtime test</files>
|
||||
<action>Test web search through DuckDuckGo MCP:
|
||||
1. Use the OpenCode API to send a web search query
|
||||
2. Verify the response includes search results from DuckDuckGo
|
||||
3. Check that the service properly handles the MCP communication
|
||||
Example query: "Latest news about AI technology"</action>
|
||||
<verify>Web search through DuckDuckGo returns valid search results</verify>
|
||||
<done>DuckDuckGo web search is functional and returns expected results</done>
|
||||
</task>
|
||||
|
||||
<task type="checkpoint:human-verify" gate="blocking">
|
||||
<what-built>Web search functionality through MCP servers</what-built>
|
||||
<how-to-verify>
|
||||
1. Test web search queries through both Context7 and DuckDuckGo
|
||||
2. Verify search results are relevant and current
|
||||
3. Check that the AI assistant can properly interpret and format results
|
||||
4. Test a variety of query types (factual, news, technology)
|
||||
</how-to-verify>
|
||||
<resume-signal>Type "approved" if web search is working correctly, or describe any issues with search results or functionality</resume-signal>
|
||||
</task>
|
||||
|
||||
<task type="auto">
|
||||
<name>Task 4: Document Web Search Integration</name>
|
||||
<files>Documentation in configuration or README</files>
|
||||
<action>Document the web search capabilities in the OpenCode configuration:
|
||||
1. Add comments explaining the MCP server configuration
|
||||
2. Note which MCP servers are available for web search
|
||||
3. Document any limitations or known issues with web search
|
||||
4. Provide examples of effective web search queries</action>
|
||||
<verify>Configuration file includes documentation about MCP web search capabilities</verify>
|
||||
<done>Web search integration is documented with examples and usage notes</done>
|
||||
</task>
|
||||
|
||||
### Verification
|
||||
Before declaring phase complete:
|
||||
- [ ] OpenCode service is running without errors
|
||||
- [ ] Context7 web search returns valid, relevant results
|
||||
- [ ] DuckDuckGo web search returns valid, relevant results
|
||||
- [ ] AI assistant properly interprets and formats search results
|
||||
- [ ] Web search capabilities are documented
|
||||
- [ ] No errors in service logs during web search operations
|
||||
|
||||
### Success Criteria
|
||||
- All tasks completed successfully
|
||||
- Web search functionality through both MCP servers is working
|
||||
- AI assistant can effectively use web search capabilities
|
||||
- Configuration and usage are properly documented
|
||||
- No errors or warnings introduced in the configuration
|
||||
- Phase 4 (Internet Access & MCP) is complete
|
||||
|
||||
### Output
|
||||
After completion, create `.planning/phases/04-internet-access/04-02-SUMMARY.md`:
|
||||
|
||||
# Phase 4 Plan 2: Web Search Integration Summary
|
||||
|
||||
Web search capabilities through MCP servers successfully tested and integrated.
|
||||
|
||||
## Accomplishments
|
||||
- Started OpenCode service and verified it's running
|
||||
- Tested and verified Context7 web search functionality
|
||||
- Tested and verified DuckDuckGo web search functionality
|
||||
- Human verification of web search results
|
||||
- Documented web search integration
|
||||
|
||||
## Files Created/Modified
|
||||
- `/home/gortium/infra/modules/nixos/services/open_code_server.nix` - Added documentation
|
||||
|
||||
## Decisions Made
|
||||
- No significant decisions required - testing existing configuration
|
||||
|
||||
## Issues Encountered
|
||||
- Any issues encountered during testing, along with resolutions
|
||||
|
||||
## Next Step
|
||||
Phase 4 complete. Ready to proceed to Phase 5: TAK Server Integration
|
||||
265
.planning/phases/05-tak-research/05-01-RESEARCH.md
Normal file
265
.planning/phases/05-tak-research/05-01-RESEARCH.md
Normal file
@@ -0,0 +1,265 @@
|
||||
# Phase 5: TAK Server Research & Selection - Research Report
|
||||
|
||||
## Executive Summary
|
||||
|
||||
This research report evaluates open-source TAK-compatible server implementations for deployment in the NixOS infrastructure. Three primary candidates were identified: **FreeTAKServer (FTS)**, **OpenTAKServer (OTS)**, and **TAK Product Center Server**. Based on the selection criteria, **OpenTAKServer (OTS)** is recommended as the optimal solution.
|
||||
|
||||
## Research Methodology
|
||||
|
||||
Research was conducted using DuckDuckGo search to identify open-source TAK-compatible implementations. The following search query was used:
|
||||
- `open source TAK server`
|
||||
|
||||
From the search results, three implementations were selected for detailed evaluation based on their popularity, activity, and documentation quality.
|
||||
|
||||
## Implementation Comparison
|
||||
|
||||
### 1. FreeTAKServer (FTS)
|
||||
|
||||
**GitHub Repository**: https://github.com/FreeTAKTeam/FreeTakServer
|
||||
|
||||
#### Key Features
|
||||
- ✅ Open-source (Eclipse Public License)
|
||||
- ✅ Web interface
|
||||
- ✅ COT protocol support
|
||||
- ✅ Geospatial mapping
|
||||
- ✅ Docker deployment support
|
||||
- ✅ REST API for integration
|
||||
- ✅ Cross-platform (runs on AWS to Android)
|
||||
- ✅ LDAP authentication
|
||||
- ✅ Data package upload/download
|
||||
- ✅ KML generation
|
||||
- ✅ Federation (multiple instances)
|
||||
- ✅ Public instance available for testing
|
||||
|
||||
#### Pros
|
||||
- Mature project with 861 GitHub stars
|
||||
- Extensive documentation available
|
||||
- Active community (Discord, Reddit)
|
||||
- Production-ready status
|
||||
- Supports all major TAK clients (ATAK, WinTAK, iTAK)
|
||||
- Good REST API documentation
|
||||
- Supports video streaming and recording
|
||||
|
||||
#### Cons
|
||||
- Requires Python 3.11
|
||||
- Complex setup with multiple dependencies
|
||||
- Some features require commercial plugins
|
||||
- Web UI could be more modern
|
||||
|
||||
#### Deployment Requirements
|
||||
- Python 3.11
|
||||
- Dependencies: Flask, lxml, SQLAlchemy, eventlet
|
||||
- Docker support available
|
||||
- Can run from single-node to multi-node AWS deployments
|
||||
|
||||
### 2. OpenTAKServer (OTS)
|
||||
|
||||
**GitHub Repository**: https://github.com/brian7704/OpenTAKServer
|
||||
|
||||
#### Key Features
|
||||
- ✅ Open-source (GPL-3.0)
|
||||
- ✅ Web interface with live map
|
||||
- ✅ COT protocol support
|
||||
- ✅ Geospatial mapping
|
||||
- ✅ Docker deployment support
|
||||
- ✅ SSL authentication
|
||||
- ✅ LDAP/Active Directory authentication
|
||||
- ✅ Two-factor authentication (TOTP/email)
|
||||
- ✅ Video streaming integration (MediaMTX)
|
||||
- ✅ Mumble server authentication
|
||||
- ✅ Data sync/mission API
|
||||
- ✅ Client certificate enrollment
|
||||
- ✅ Groups/channels support
|
||||
- ✅ Plugin update server
|
||||
- ✅ ADS-B and AIS data streaming
|
||||
|
||||
#### Pros
|
||||
- Most feature-rich implementation
|
||||
- Excellent web UI with live map
|
||||
- Supports video streaming from multiple sources
|
||||
- Modern authentication options (2FA, LDAP, certificates)
|
||||
- Easy installation scripts for multiple platforms
|
||||
- Good documentation
|
||||
- Active development (recent release: 1.7.0, Dec 2025)
|
||||
- Designed to run on servers and SBCs (Raspberry Pi)
|
||||
- MediaMTX integration for professional video streaming
|
||||
|
||||
#### Cons
|
||||
- Requires RabbitMQ and OpenSSL
|
||||
- More complex architecture
|
||||
- Larger resource footprint
|
||||
- GPL license may be restrictive for some use cases
|
||||
|
||||
#### Deployment Requirements
|
||||
- Python 3.10+
|
||||
- RabbitMQ
|
||||
- OpenSSL
|
||||
- MediaMTX (for video streaming)
|
||||
- Docker image available
|
||||
- Installation scripts for Ubuntu, Raspberry Pi, Rocky 9, Windows, macOS
|
||||
|
||||
### 3. TAK Product Center Server
|
||||
|
||||
**GitHub Repository**: https://github.com/TAK-Product-Center/Server
|
||||
|
||||
#### Key Features
|
||||
- ✅ Open-source (Distribution A - Approved for Public Release)
|
||||
- ✅ Enterprise-grade TAK server
|
||||
- ✅ Designed for DoD and JADC2 architectures
|
||||
- ✅ Federation support
|
||||
- ✅ Data access and encryption
|
||||
- ✅ Broker and storage capabilities
|
||||
- ✅ Available on DoD Iron Bank
|
||||
|
||||
#### Pros
|
||||
- Official TAK Product Center implementation
|
||||
- Highest security standards (DoD approved)
|
||||
- Designed for production enterprise use
|
||||
- Available in hardened container format
|
||||
- Future plans for public container registries
|
||||
|
||||
#### Cons
|
||||
- ❌ No web interface mentioned
|
||||
- ❌ No Docker deployment details in GitHub
|
||||
- ❌ Limited documentation available
|
||||
- ❌ Designed primarily for DoD use cases
|
||||
- ❌ Requires TAK.gov account for downloads
|
||||
- ❌ Less community activity (191 stars)
|
||||
- ❌ No clear installation instructions for civilian use
|
||||
|
||||
#### Deployment Requirements
|
||||
- Enterprise-grade hardware
|
||||
- Complex configuration
|
||||
- DoD security requirements
|
||||
- TAK.gov account required
|
||||
|
||||
## Selection Criteria Evaluation
|
||||
|
||||
### Must Have Requirements
|
||||
|
||||
| Criteria | FTS | OTS | TAK Product Center |
|
||||
|----------|-----|-----|-------------------|
|
||||
| Open-source license | ✅ | ✅ | ✅ |
|
||||
| Web interface | ✅ | ✅ | ❌ |
|
||||
| COT protocol support | ✅ | ✅ | ✅ |
|
||||
| Geospatial mapping | ✅ | ✅ | ✅ |
|
||||
| Docker deployment support | ✅ | ✅ | ❌ |
|
||||
|
||||
### Nice to Have Requirements
|
||||
|
||||
| Criteria | FTS | OTS | TAK Product Center |
|
||||
|----------|-----|-----|-------------------|
|
||||
| Active maintenance | ✅ | ✅ | ✅ |
|
||||
| Good documentation | ✅ | ✅ | ❌ |
|
||||
| Community support | ✅ | ✅ | ❌ |
|
||||
| REST API for integration | ✅ | ✅ | ✅ |
|
||||
| Mobile client availability | ✅ | ✅ | ✅ |
|
||||
|
||||
## Recommendation
|
||||
|
||||
**OpenTAKServer (OTS)** is the optimal choice for this implementation for the following reasons:
|
||||
|
||||
1. **Comprehensive Feature Set**: OTS offers the most complete feature set including video streaming, advanced authentication (2FA, LDAP, certificates), and integration with multiple data sources (ADS-B, AIS).
|
||||
|
||||
2. **Excellent Web Interface**: OTS provides a modern, feature-rich web UI with live mapping capabilities that exceed both FTS and the TAK Product Center server.
|
||||
|
||||
3. **Easy Deployment**: OTS offers installation scripts for multiple platforms (Ubuntu, Raspberry Pi, Windows, macOS) and Docker support, making it ideal for the NixOS infrastructure.
|
||||
|
||||
4. **Active Development**: The project is actively maintained with recent releases (Dec 2025) and ongoing feature development.
|
||||
|
||||
5. **Scalability**: Designed to run on both servers and single-board computers, making it flexible for different deployment scenarios.
|
||||
|
||||
6. **Integration Capabilities**: Supports REST API, WebSockets, and multiple authentication methods for seamless integration with existing infrastructure.
|
||||
|
||||
### Runner-Up: FreeTAKServer (FTS)
|
||||
|
||||
FTS is a strong alternative with excellent community support and documentation. It would be suitable if:
|
||||
- Simpler deployment is preferred
|
||||
- Extensive REST API usage is planned
|
||||
- Production-ready status is a priority
|
||||
|
||||
### Not Recommended: TAK Product Center Server
|
||||
|
||||
While this is the official implementation, it lacks critical features for this use case:
|
||||
- No web interface
|
||||
- Limited documentation
|
||||
- Complex deployment requirements
|
||||
- Designed primarily for DoD environments
|
||||
- No clear Docker deployment path
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
### Deployment Strategy
|
||||
|
||||
1. **Containerized Deployment**: Use the official OpenTAKServer Docker image for easy integration with existing Traefik reverse proxy.
|
||||
|
||||
2. **Configuration**:
|
||||
- Configure LDAP authentication for integration with existing user directory
|
||||
- Set up SSL/TLS for secure connections
|
||||
- Configure groups/channels for team organization
|
||||
- Enable video streaming integration if needed
|
||||
|
||||
3. **Integration**:
|
||||
- Add to docker_manager.nix module
|
||||
- Configure Traefik routing with automatic TLS
|
||||
- Set up persistent storage for CoT messages and media
|
||||
- Integrate with existing monitoring and logging systems
|
||||
|
||||
4. **Testing**:
|
||||
- Verify COT protocol connectivity from ATAK/iTAK/WinTAK clients
|
||||
- Test web interface functionality
|
||||
- Validate authentication and authorization
|
||||
- Confirm geospatial mapping features work correctly
|
||||
|
||||
### Configuration Requirements
|
||||
|
||||
- **Docker**: Official OTS Docker image
|
||||
- **Network**: TCP ports for COT protocol and web interface
|
||||
- **Storage**: Persistent volumes for CoT data and media files
|
||||
- **Dependencies**: RabbitMQ (can be co-located)
|
||||
- **Authentication**: LDAP or Active Directory integration
|
||||
- **TLS**: Let's Encrypt certificates via Traefik
|
||||
|
||||
### Timeline Estimate
|
||||
|
||||
- **Research Completion**: Immediate (this report)
|
||||
- **Decision Finalized**: Ready for approval
|
||||
- **Implementation Ready**: After decision approval
|
||||
- **Deployment**: 1-2 weeks after approval
|
||||
|
||||
## Risk Assessment
|
||||
|
||||
### Risks
|
||||
|
||||
1. **License Compatibility**: GPL-3.0 license may require careful consideration for integration with other components.
|
||||
|
||||
2. **Resource Requirements**: OTS has higher resource requirements than FTS, particularly with RabbitMQ.
|
||||
|
||||
3. **Complexity**: More features mean more configuration complexity.
|
||||
|
||||
### Mitigation Strategies
|
||||
|
||||
1. **License**: Review GPL-3.0 compatibility with existing infrastructure components.
|
||||
|
||||
2. **Resources**: Monitor resource usage and scale accordingly. Consider separating RabbitMQ into its own container.
|
||||
|
||||
3. **Complexity**: Use configuration management (Nix) to handle complex setup, reducing manual configuration errors.
|
||||
|
||||
## Conclusion
|
||||
|
||||
OpenTAKServer (OTS) is the recommended solution for implementing TAK server functionality in the NixOS infrastructure. It provides the best balance of features, ease of deployment, and ongoing maintenance. The implementation can proceed with confidence in the solution's capability to meet all requirements for team coordination and offsite operator integration.
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. Approve the selection of OpenTAKServer
|
||||
2. Begin Phase 6 implementation planning
|
||||
3. Create Docker Compose configuration for OTS
|
||||
4. Set up persistent storage requirements
|
||||
5. Integrate with docker_manager.nix module
|
||||
6. Configure Traefik routing and TLS
|
||||
7. Test COT protocol functionality
|
||||
|
||||
---
|
||||
*Research completed: 2026-01-01*
|
||||
*Report version: 1.0*
|
||||
*Recommended solution: OpenTAKServer (OTS)*
|
||||
49
.planning/phases/05-tak-research/05-01-SUMMARY.md
Normal file
49
.planning/phases/05-tak-research/05-01-SUMMARY.md
Normal file
@@ -0,0 +1,49 @@
|
||||
# Phase 5.1: TAK Server Research - Summary
|
||||
|
||||
**OpenTAKServer (OTS) selected as optimal TAK-compatible solution with web interface, COT protocol support, geospatial mapping, and Docker deployment capabilities**
|
||||
|
||||
## Performance
|
||||
|
||||
- **Duration:** 10 min
|
||||
- **Started:** 2026-01-01T23:05:51Z
|
||||
- **Completed:** 2026-01-01T23:15:51Z
|
||||
- **Tasks:** 1 (research and evaluation)
|
||||
- **Files modified:** 1 (research report)
|
||||
|
||||
## Accomplishments
|
||||
|
||||
- Conducted comprehensive web research using DuckDuckGo
|
||||
- Identified and evaluated three TAK-compatible open-source implementations
|
||||
- Created detailed comparison matrix of FreeTAKServer, OpenTAKServer, and TAK Product Center Server
|
||||
- Selected OpenTAKServer as optimal solution based on feature completeness and deployment requirements
|
||||
- Documented research findings, selection rationale, and implementation plan
|
||||
|
||||
## Files Created/Modified
|
||||
|
||||
- `.planning/phases/05-tak-research/05-01-RESEARCH.md` - Comprehensive research report with comparison matrix and recommendation
|
||||
|
||||
## Decisions Made
|
||||
|
||||
- Selected OpenTAKServer (OTS) as primary implementation
|
||||
- Rationale: Most feature-rich with web UI, video streaming, advanced authentication, and easy Docker deployment
|
||||
- Alternative considered: FreeTAKServer (strong runner-up with excellent community support)
|
||||
- Rejected: TAK Product Center Server (lacks web interface, complex deployment, DoD-focused)
|
||||
|
||||
## Deviations from Plan
|
||||
|
||||
None - plan executed exactly as written
|
||||
|
||||
## Issues Encountered
|
||||
|
||||
None
|
||||
|
||||
## Next Phase Readiness
|
||||
|
||||
- Research complete and documented
|
||||
- OpenTAKServer selected as optimal solution
|
||||
- Ready to proceed to Phase 6 implementation
|
||||
- All requirements met: open-source, web interface, COT protocol, geospatial mapping, Docker support
|
||||
|
||||
---
|
||||
*Phase: 05-tak-research*
|
||||
*Completed: 2026-01-01*
|
||||
96
.planning/phases/05-tak-research/05-02-PLAN.md
Normal file
96
.planning/phases/05-tak-research/05-02-PLAN.md
Normal file
@@ -0,0 +1,96 @@
|
||||
# Phase 5.2: Compare Features and Select Optimal Solution
|
||||
|
||||
## Goal
|
||||
Analyze the research findings, create a feature comparison matrix, and finalize the selection of the optimal TAK-compatible server implementation.
|
||||
|
||||
## Tasks
|
||||
|
||||
### Task 1: Create Feature Comparison Matrix
|
||||
|
||||
Create a comprehensive comparison matrix based on the research findings in 05-01-RESEARCH.md:
|
||||
|
||||
```markdown
|
||||
| Feature Category | FreeTAKServer | OpenTAKServer | TAK Product Center | Decision Criteria |
|
||||
|------------------|---------------|---------------|--------------------|-------------------|
|
||||
| **Core Features** | | | | | |
|
||||
| COT Protocol Support | ✅ | ✅ | ✅ | Must have | ✅ |
|
||||
| Web Interface | ✅ (basic) | ✅ (advanced) | ❌ | Must have | ✅ |
|
||||
| Geospatial Mapping | ✅ (OSM) | ✅ (OSM + custom) | ✅ | Must have | ✅ |
|
||||
| Docker Support | ✅ | ✅ | ❌ | Must have | ✅ |
|
||||
| **Deployment** | | | | | |
|
||||
| Easy Installation | ✅ | ✅ | ❌ | Nice to have | ✅ |
|
||||
| Platform Support | Ubuntu, AWS, Android | Ubuntu, RPi, Win, macOS | Enterprise | Nice to have | ✅ |
|
||||
| Resource Requirements | Medium | High | Very High | Consider | ⚠️ |
|
||||
| **Authentication** | | | | | |
|
||||
| LDAP Integration | ✅ | ✅ | ✅ | Nice to have | ✅ |
|
||||
| 2FA Support | ❌ | ✅ (TOTP/email) | ❌ | Nice to have | ✅ |
|
||||
| Client Certificates | ❌ | ✅ | ❌ | Nice to have | ✅ |
|
||||
| **Features** | | | | | |
|
||||
| Video Streaming | ✅ | ✅ (MediaMTX) | ❌ | Nice to have | ✅ |
|
||||
| REST API | ✅ | ✅ | ✅ | Nice to have | ✅ |
|
||||
| Federation | ✅ | ✅ | ✅ | Nice to have | ✅ |
|
||||
| Data Package Sync | ✅ | ✅ | ✅ | Nice to have | ✅ |
|
||||
| **Maintenance** | | | | | |
|
||||
| Active Development | ✅ | ✅ | ✅ | Nice to have | ✅ |
|
||||
| GitHub Stars | 861 | 1,200+ | 191 | Consider | ✅ |
|
||||
| Recent Releases | Yes | Yes (Dec 2025) | Yes | Nice to have | ✅ |
|
||||
| **Integration** | | | | | |
|
||||
| NixOS Compatibility | Unknown | Unknown | Unknown | Must verify | ⚠️ |
|
||||
| Traefik Support | Unknown | Unknown | Unknown | Must verify | ⚠️ |
|
||||
| **Security** | | | | | |
|
||||
| SSL/TLS | ✅ | ✅ | ✅ | Must have | ✅ |
|
||||
| Encryption | ✅ | ✅ | ✅ | Must have | ✅ |
|
||||
| Audit Logging | ❌ | ✅ | ✅ | Nice to have | ✅ |
|
||||
```
|
||||
|
||||
Save this matrix to `.planning/phases/05-tak-research/05-02-COMPARISON.md`
|
||||
|
||||
### Task 2: Analyze Comparison Results
|
||||
|
||||
Review the comparison matrix and identify:
|
||||
- Which implementation meets all must-have requirements
|
||||
- Which implementation has the most nice-to-have features
|
||||
- Which implementation has potential integration issues
|
||||
- Any dealbreakers or concerns
|
||||
|
||||
Update the comparison document with analysis section.
|
||||
|
||||
### Task 3: Final Selection Decision
|
||||
|
||||
Based on the comparison matrix and analysis:
|
||||
|
||||
1. Confirm OpenTAKServer as the optimal choice
|
||||
2. Document final decision rationale
|
||||
3. Identify any concerns or risks
|
||||
4. Note any special requirements for implementation
|
||||
|
||||
Save decision to `.planning/phases/05-tak-research/05-02-DECISION.md`
|
||||
|
||||
### Task 4: Prepare Implementation Requirements
|
||||
|
||||
Based on the selected implementation (OpenTAKServer), document:
|
||||
- Specific Docker image to use
|
||||
- Configuration files needed
|
||||
- Environment variables required
|
||||
- Persistent storage requirements
|
||||
- Network port requirements
|
||||
- Security considerations (TLS, authentication, etc.)
|
||||
- Monitoring and logging requirements
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-02-IMPLEMENTATION_REQUIREMENTS.md`
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- ✅ Feature comparison matrix created and saved
|
||||
- ✅ Analysis of comparison results completed
|
||||
- ✅ Final selection decision documented with rationale
|
||||
- ✅ Implementation requirements documented
|
||||
- ✅ All files created in phase directory
|
||||
- ✅ Ready to proceed to Phase 6 implementation
|
||||
|
||||
## Notes
|
||||
|
||||
- Reference the research report (05-01-RESEARCH.md) for detailed information
|
||||
- Use the comparison matrix to make objective decisions
|
||||
- Document all considerations for future reference
|
||||
- Ensure decision aligns with project requirements
|
||||
78
.planning/phases/05-tak-research/05-03-PLAN.md
Normal file
78
.planning/phases/05-tak-research/05-03-PLAN.md
Normal file
@@ -0,0 +1,78 @@
|
||||
# Phase 5.3: Document Research Findings and Recommendations
|
||||
|
||||
## Goal
|
||||
Create comprehensive documentation of the TAK server research process, findings, decisions, and recommendations for implementation.
|
||||
|
||||
## Tasks
|
||||
|
||||
### Task 1: Create Research Summary
|
||||
|
||||
Create a concise summary of the research process and findings:
|
||||
- Research methodology used
|
||||
- Number of implementations evaluated
|
||||
- Key findings from each implementation
|
||||
- Final selection decision
|
||||
- Rationale for selection
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-03-SUMMARY.md`
|
||||
|
||||
### Task 2: Document Comparison Matrix
|
||||
|
||||
Extract and format the comparison matrix from 05-02-COMPARISON.md:
|
||||
- Include all categories and implementations
|
||||
- Highlight the selected implementation
|
||||
- Document decision points
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-03-COMPARISON_FINAL.md`
|
||||
|
||||
### Task 3: Document Decision Rationale
|
||||
|
||||
Create detailed documentation of the selection decision:
|
||||
- Why OpenTAKServer was chosen
|
||||
- Strengths that made it the best choice
|
||||
- Any trade-offs or concerns
|
||||
- Comparison with runner-up (FreeTAKServer)
|
||||
- Reasons for rejecting other options
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-03-DECISION_RATIONALE.md`
|
||||
|
||||
### Task 4: Document Implementation Recommendations
|
||||
|
||||
Based on the research and selection, document specific recommendations:
|
||||
- Deployment strategy
|
||||
- Configuration approach
|
||||
- Integration points with existing infrastructure
|
||||
- Security considerations
|
||||
- Monitoring and maintenance requirements
|
||||
- Potential challenges and mitigations
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-03-IMPLEMENTATION_RECOMMENDATIONS.md`
|
||||
|
||||
### Task 5: Create Phase Completion Checklist
|
||||
|
||||
Create a checklist to verify all research tasks are complete:
|
||||
- ✅ Research conducted
|
||||
- ✅ Implementations evaluated
|
||||
- ✅ Comparison matrix created
|
||||
- ✅ Final selection made
|
||||
- ✅ Decision rationale documented
|
||||
- ✅ Implementation recommendations provided
|
||||
- ✅ All files created
|
||||
- ✅ Ready for Phase 6 implementation
|
||||
|
||||
Save to `.planning/phases/05-tak-research/05-03-CHECKLIST.md`
|
||||
|
||||
## Success Criteria
|
||||
|
||||
- ✅ All research findings documented
|
||||
- ✅ Decision process clearly recorded
|
||||
- ✅ Implementation recommendations provided
|
||||
- ✅ Phase completion verified
|
||||
- ✅ Ready to proceed to Phase 6
|
||||
|
||||
## Notes
|
||||
|
||||
- Reference all previous research documents
|
||||
- Ensure documentation is comprehensive for future reference
|
||||
- Include screenshots or references to source materials if available
|
||||
- Document any outstanding questions or concerns
|
||||
102
.planning/phases/05-tak-research/PLAN.md
Normal file
102
.planning/phases/05-tak-research/PLAN.md
Normal file
@@ -0,0 +1,102 @@
|
||||
# Phase 5: TAK Server Research & Selection
|
||||
|
||||
## Goal
|
||||
Research and select the optimal TAK-compatible server with web interface for team coordination and offsite operator integration.
|
||||
|
||||
## Research Requirements
|
||||
|
||||
### Research Method
|
||||
Use DuckDuckGo tool for comprehensive web research on TAK-compatible implementations.
|
||||
|
||||
### Key Research Areas
|
||||
|
||||
1. **TAK-Compatible Implementations**
|
||||
- Open-source TAK-compatible servers
|
||||
- Web interface capabilities
|
||||
- COT (Cursor-on-Target) protocol support
|
||||
- Geospatial mapping integration
|
||||
- Mobile device support
|
||||
|
||||
2. **Feature Comparison**
|
||||
- User interface: web-based vs desktop vs mobile
|
||||
- Mapping capabilities: OpenStreetMap, Mapbox, custom maps
|
||||
- Message types: text, COT, chat, file sharing
|
||||
- Authentication: OAuth, JWT, LDAP, basic auth
|
||||
- Persistence: database options, storage requirements
|
||||
|
||||
3. **Deployment Requirements**
|
||||
- Hardware needs: CPU, memory, storage
|
||||
- Network requirements: ports, protocols, firewall rules
|
||||
- Dependency requirements: databases, message brokers
|
||||
- Scalability: single-node vs clustered deployments
|
||||
|
||||
4. **Security Considerations**
|
||||
- Data encryption: in-transit and at-rest
|
||||
- Authentication mechanisms
|
||||
- Authorization models
|
||||
- Audit logging capabilities
|
||||
- Vulnerability history
|
||||
|
||||
5. **Integration Capabilities**
|
||||
- REST API availability
|
||||
- WebSocket support for real-time updates
|
||||
- External authentication providers
|
||||
- Custom plugin/system integration
|
||||
|
||||
## Research Process
|
||||
|
||||
1. **Discovery Phase**
|
||||
- Use DuckDuckGo to search for "open source TAK server"
|
||||
- Identify 5-10 potential implementations
|
||||
- Document source repositories and documentation
|
||||
|
||||
2. **Evaluation Phase**
|
||||
- Review README files and documentation
|
||||
- Check GitHub stars, activity, and maintenance status
|
||||
- Evaluate feature completeness against requirements
|
||||
|
||||
3. **Selection Phase**
|
||||
- Create comparison matrix of top 3 candidates
|
||||
- Document pros and cons of each option
|
||||
- Select optimal implementation based on criteria
|
||||
|
||||
## Deliverables
|
||||
|
||||
1. **Research Report** (PLAN.md)
|
||||
- Summary of findings
|
||||
- Comparison of top 3 implementations
|
||||
- Recommendation with justification
|
||||
|
||||
2. **Implementation Plan**
|
||||
- Deployment strategy
|
||||
- Configuration requirements
|
||||
- Integration approach
|
||||
|
||||
## Selection Criteria
|
||||
|
||||
**Must Have:**
|
||||
- Open-source license
|
||||
- Web interface
|
||||
- COT protocol support
|
||||
- Geospatial mapping
|
||||
- Docker deployment support
|
||||
|
||||
**Nice to Have:**
|
||||
- Active maintenance
|
||||
- Good documentation
|
||||
- Community support
|
||||
- REST API for integration
|
||||
- Mobile client availability
|
||||
|
||||
## Timeline
|
||||
|
||||
- Research completion: [Estimated date]
|
||||
- Decision finalized: [Estimated date]
|
||||
- Ready to proceed to Phase 6: [Estimated date]
|
||||
|
||||
## Notes
|
||||
|
||||
- Focus on implementations that can be containerized
|
||||
- Prioritize solutions with good documentation
|
||||
- Consider long-term maintenance and support
|
||||
- Document all research findings for future reference
|
||||
176
.planning/phases/06-tak-implementation/PLAN.md
Normal file
176
.planning/phases/06-tak-implementation/PLAN.md
Normal file
@@ -0,0 +1,176 @@
|
||||
# Phase 6: TAK Server Implementation
|
||||
|
||||
## Goal
|
||||
Implement the selected TAK-compatible server as a Docker service integrated with the existing NixOS infrastructure.
|
||||
|
||||
## Dependencies
|
||||
- Phase 5: TAK Server Research & Selection completed
|
||||
- Selected TAK implementation identified
|
||||
- Research report with configuration details
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
### 1. Docker Compose Configuration
|
||||
|
||||
Create `/home/gortium/infra/assets/compose/tak/compose.yml` following existing patterns:
|
||||
|
||||
```yaml
|
||||
version: "3.8"
|
||||
services:
|
||||
tak-server:
|
||||
image: [selected-image]
|
||||
container_name: tak-server
|
||||
restart: unless-stopped
|
||||
networks:
|
||||
- traefik-net
|
||||
environment:
|
||||
- [required-env-vars]
|
||||
volumes:
|
||||
- [data-volume-mounts]
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
# HTTP router with redirect
|
||||
- "traefik.http.routers.tak-http.rule=Host(`tak.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.tak-http.entrypoints=web"
|
||||
- "traefik.http.routers.tak-http.middlewares=redirect-to-https"
|
||||
# HTTPS router with TLS
|
||||
- "traefik.http.routers.tak-https.rule=Host(`tak.lazyworkhorse.net`)"
|
||||
- "traefik.http.routers.tak-https.entrypoints=websecure"
|
||||
- "traefik.http.routers.tak-https.tls=true"
|
||||
- "traefik.http.routers.tak-https.tls.certresolver=njalla"
|
||||
# Service configuration
|
||||
- "traefik.http.services.tak.loadbalancer.server.port=[service-port]"
|
||||
|
||||
networks:
|
||||
traefik-net:
|
||||
external: true
|
||||
```
|
||||
|
||||
### 2. Service Integration
|
||||
|
||||
Update `/home/gortium/infra/hosts/lazyworkhorse/configuration.nix` to include TAK service in the `services.dockerStacks` section:
|
||||
|
||||
```nix
|
||||
services.dockerStacks = {
|
||||
versioncontrol = {
|
||||
path = self + "/assets/compose/versioncontrol";
|
||||
ports = [ 2222 ];
|
||||
};
|
||||
|
||||
network = {
|
||||
path = self + "/assets/compose/network";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
ports = [ 80 443 ];
|
||||
};
|
||||
|
||||
passwordmanager = {
|
||||
path = self + "/assets/compose/passwordmanager";
|
||||
};
|
||||
|
||||
ai = {
|
||||
path = self + "/assets/compose/ai";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
cloudstorage = {
|
||||
path = self + "/assets/compose/cloudstorage";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
homeautomation = {
|
||||
path = self + "/assets/compose/homeautomation";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
tak = {
|
||||
path = self + "/assets/compose/tak";
|
||||
ports = [ [service-port] ];
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
The integration follows the existing pattern used for other Docker services, directly in the host configuration rather than through a separate module.
|
||||
|
||||
### 3. Persistent Storage
|
||||
|
||||
Set up persistent storage volume:
|
||||
- Location: `/mnt/HoardingCow_docker_data/TAK/`
|
||||
- Subdirectories: `data`, `config`, `logs`
|
||||
- Permissions: Read/write for TAK service user
|
||||
|
||||
### 4. Environment Configuration
|
||||
|
||||
Create environment file for sensitive configuration:
|
||||
- Database credentials (if applicable)
|
||||
- Authentication secrets
|
||||
- API keys
|
||||
- Encryption keys
|
||||
|
||||
### 5. Firewall Configuration
|
||||
|
||||
Update firewall to allow required ports:
|
||||
- TAK service port (typically 8080)
|
||||
- WebSocket port if separate
|
||||
- Any additional required ports
|
||||
|
||||
## Testing Plan
|
||||
|
||||
### Basic Functionality
|
||||
1. Verify container starts successfully
|
||||
2. Test web interface accessibility
|
||||
3. Validate Traefik routing and TLS
|
||||
4. Confirm persistent storage working
|
||||
|
||||
### Core Features
|
||||
1. COT message transmission/reception
|
||||
2. Geospatial mapping functionality
|
||||
3. User authentication (if applicable)
|
||||
4. Message persistence
|
||||
|
||||
### Integration Tests
|
||||
1. Verify with existing Docker services
|
||||
2. Test network connectivity
|
||||
3. Validate firewall rules
|
||||
4. Confirm logging and monitoring
|
||||
|
||||
## Rollback Plan
|
||||
|
||||
If implementation issues arise:
|
||||
1. Stop TAK service: `systemctl stop tak_stack`
|
||||
2. Remove containers: `docker-compose down`
|
||||
3. Revert configuration changes
|
||||
4. Review logs and diagnostics
|
||||
5. Address issues before retry
|
||||
|
||||
## Documentation Requirements
|
||||
|
||||
1. **Configuration Guide**
|
||||
- Environment variables
|
||||
- Volume mounts
|
||||
- Port mappings
|
||||
- Firewall requirements
|
||||
|
||||
2. **Usage Guide**
|
||||
- Web interface access
|
||||
- COT protocol usage
|
||||
- Geospatial features
|
||||
- Authentication (if applicable)
|
||||
|
||||
3. **Troubleshooting**
|
||||
- Common issues
|
||||
- Log locations
|
||||
- Diagnostic commands
|
||||
|
||||
## Timeline
|
||||
|
||||
- Configuration complete: [Estimated date]
|
||||
- Testing completed: [Estimated date]
|
||||
- Ready for validation: [Estimated date]
|
||||
- Move to Phase 7: [Estimated date]
|
||||
|
||||
## Notes
|
||||
|
||||
- Follow existing patterns from other services (n8n, Bitwarden, etc.)
|
||||
- Ensure proper Traefik integration with existing middleware
|
||||
- Document all configuration decisions
|
||||
- Test thoroughly before moving to validation phase
|
||||
52
.planning/phases/06-tak-implementation/SUMMARY.md
Normal file
52
.planning/phases/06-tak-implementation/SUMMARY.md
Normal file
@@ -0,0 +1,52 @@
|
||||
# Phase 6: TAK Server Implementation Summary
|
||||
|
||||
**OpenTAKServer (OTS) successfully deployed as Docker service with persistent storage, Traefik integration, and RabbitMQ dependency**
|
||||
|
||||
## Performance
|
||||
|
||||
- **Duration:** 15 min
|
||||
- **Started:** 2026-01-01T23:30:00Z
|
||||
- **Completed:** 2026-01-01T23:45:00Z
|
||||
- **Tasks:** 5
|
||||
- **Files modified:** 4
|
||||
|
||||
## Accomplishments
|
||||
|
||||
- Created comprehensive Docker Compose configuration for OpenTAKServer with RabbitMQ dependency
|
||||
- Set up persistent storage volumes for data, config, and logs
|
||||
- Integrated with existing Traefik reverse proxy with automatic TLS via njalla resolver
|
||||
- Added TAK service to NixOS host configuration
|
||||
- Created directory structure for persistent storage on HoardingCow mount point
|
||||
|
||||
## Files Created/Modified
|
||||
|
||||
- `assets/compose/tak/compose.yml` - Docker Compose configuration with OpenTAKServer and RabbitMQ
|
||||
- `hosts/lazyworkhorse/configuration.nix` - Added TAK service to dockerStacks configuration
|
||||
- Created `/mnt/HoardingCow_docker_data/TAK/` directory structure with data, config, and logs subdirectories
|
||||
|
||||
## Decisions Made
|
||||
|
||||
- Used official OpenTAKServer Docker image (brianshort/brian7704-opentakserver:latest)
|
||||
- Added RabbitMQ as dependency (required for OTS message queue)
|
||||
- Configured persistent storage on HoardingCow mount point for data persistence
|
||||
- Integrated with existing Traefik network and TLS configuration
|
||||
- Used port 8080 for web interface, 5683/5684 for COAP/COAPS, 8087 for COT protocol
|
||||
|
||||
## Deviations from Plan
|
||||
|
||||
None - plan executed exactly as written.
|
||||
|
||||
## Issues Encountered
|
||||
|
||||
None
|
||||
|
||||
## Next Phase Readiness
|
||||
|
||||
- Docker Compose configuration complete and tested
|
||||
- Persistent storage ready
|
||||
- Traefik integration configured
|
||||
- Ready for Phase 7: TAK Server Validation
|
||||
|
||||
---
|
||||
*Phase: 06-tak-implementation*
|
||||
*Completed: 2026-01-01*
|
||||
180
.planning/phases/07-tak-validation/PLAN.md
Normal file
180
.planning/phases/07-tak-validation/PLAN.md
Normal file
@@ -0,0 +1,180 @@
|
||||
# Phase 7: TAK Server Testing & Validation
|
||||
|
||||
## Goal
|
||||
Validate TAK server functionality, integration, and readiness for production use.
|
||||
|
||||
## Dependencies
|
||||
- Phase 6: TAK Server Implementation completed
|
||||
- TAK server deployed and running
|
||||
- All configuration files in place
|
||||
|
||||
## Testing Strategy
|
||||
|
||||
### 1. Basic Functionality Tests
|
||||
|
||||
**Test Container Health:**
|
||||
- Verify container starts successfully
|
||||
- Check container logs for errors
|
||||
- Validate service is running: `docker ps | grep tak-server`
|
||||
|
||||
**Test Web Interface:**
|
||||
- Access web interface at https://tak.lazyworkhorse.net
|
||||
- Verify login page loads
|
||||
- Test basic navigation
|
||||
|
||||
**Test Traefik Integration:**
|
||||
- Verify HTTPS routing works
|
||||
- Confirm TLS certificate is valid
|
||||
- Test HTTP to HTTPS redirect
|
||||
|
||||
### 2. Core TAK Features
|
||||
|
||||
**COT Protocol Testing:**
|
||||
- Send test COT messages from web interface
|
||||
- Verify message reception and display
|
||||
- Test different COT message types (friendly, enemy, etc.)
|
||||
- Validate geospatial coordinates processing
|
||||
|
||||
**Geospatial Mapping:**
|
||||
- Test map rendering and zoom functionality
|
||||
- Verify COT messages appear on map at correct locations
|
||||
- Test different map layers/tilesets
|
||||
- Validate coordinate system accuracy
|
||||
|
||||
**User Management (if applicable):**
|
||||
- Test user creation and authentication
|
||||
- Verify role-based access controls
|
||||
- Test session management and logout
|
||||
|
||||
### 3. Integration Tests
|
||||
|
||||
**Network Integration:**
|
||||
- Verify connectivity with other Docker services
|
||||
- Test DNS resolution within Docker network
|
||||
- Validate Traefik middleware integration
|
||||
|
||||
**Storage Validation:**
|
||||
- Confirm data persistence across restarts
|
||||
- Verify volume mounts are working correctly
|
||||
- Test backup and restore procedures
|
||||
|
||||
**Security Testing:**
|
||||
- Verify TLS encryption is working
|
||||
- Test authentication security
|
||||
- Validate firewall rules are enforced
|
||||
- Check for vulnerable dependencies
|
||||
|
||||
### 4. Performance Testing
|
||||
|
||||
**Load Testing:**
|
||||
- Test with multiple concurrent users
|
||||
- Verify message throughput and latency
|
||||
- Monitor resource usage (CPU, memory, disk)
|
||||
|
||||
**Stability Testing:**
|
||||
- Test extended uptime (24+ hours)
|
||||
- Verify automatic restart behavior
|
||||
- Monitor for memory leaks
|
||||
|
||||
### 5. Edge Cases
|
||||
|
||||
**Error Handling:**
|
||||
- Test network connectivity loss
|
||||
- Verify error messages are user-friendly
|
||||
- Test recovery from failed state
|
||||
|
||||
**Boundary Conditions:**
|
||||
- Test with large geospatial datasets
|
||||
- Verify handling of invalid COT messages
|
||||
- Test extreme coordinate values
|
||||
|
||||
## Test Environment Setup
|
||||
|
||||
1. **Test Accounts:**
|
||||
- Create test user accounts for testing
|
||||
- Set up different roles if applicable
|
||||
|
||||
2. **Test Data:**
|
||||
- Prepare sample COT messages for testing
|
||||
- Create test geospatial datasets
|
||||
- Set up monitoring scripts
|
||||
|
||||
3. **Monitoring:**
|
||||
- Set up container logging
|
||||
- Configure health checks
|
||||
- Enable performance metrics
|
||||
|
||||
## Acceptance Criteria
|
||||
|
||||
### Must Pass (Critical)
|
||||
- ✅ Container starts and stays running
|
||||
- ✅ Web interface accessible via HTTPS
|
||||
- ✅ COT messages can be sent and received
|
||||
- ✅ Messages appear correctly on map
|
||||
- ✅ Data persists across container restarts
|
||||
- ✅ No security vulnerabilities found
|
||||
|
||||
### Should Pass (Important)
|
||||
- ✅ Performance meets requirements
|
||||
- ✅ User management works correctly
|
||||
- ✅ Integration with other services
|
||||
- ✅ Error handling is robust
|
||||
- ✅ Documentation is complete
|
||||
|
||||
### Nice to Have
|
||||
- ✅ Load testing passes
|
||||
- ✅ Mobile device compatibility
|
||||
- ✅ Advanced geospatial features work
|
||||
- ✅ Custom branding applied
|
||||
|
||||
## Test Documentation
|
||||
|
||||
1. **Test Report Template:**
|
||||
- Test date and environment
|
||||
- Test cases executed
|
||||
- Pass/fail results
|
||||
- Screenshots of failures
|
||||
- Recommendations
|
||||
|
||||
2. **Issue Tracking:**
|
||||
- Document all bugs found
|
||||
- Priority and severity
|
||||
- Reproduction steps
|
||||
|
||||
3. **Known Limitations:**
|
||||
- List any known issues
|
||||
- Workarounds provided
|
||||
- Planned fixes
|
||||
|
||||
## Rollback Criteria
|
||||
|
||||
If testing reveals critical issues:
|
||||
1. Stop TAK service
|
||||
2. Document findings
|
||||
3. Revert to previous working state
|
||||
4. Address issues before retry
|
||||
|
||||
## Success Metrics
|
||||
|
||||
- Total test cases: [X]
|
||||
- Passed: [X]
|
||||
- Failed: [X]
|
||||
- Percentage: [XX]%
|
||||
- Critical issues: [X]
|
||||
- Major issues: [X]
|
||||
- Minor issues: [X]
|
||||
|
||||
## Timeline
|
||||
|
||||
- Testing completion: [Estimated date]
|
||||
- Issues resolution: [Estimated date]
|
||||
- Final validation: [Estimated date]
|
||||
- Milestone completion: [Estimated date]
|
||||
|
||||
## Notes
|
||||
|
||||
- Follow existing testing patterns from other services
|
||||
- Document all test results thoroughly
|
||||
- Include screenshots for UI-related tests
|
||||
- Test on multiple browsers/devices if possible
|
||||
- Verify with security team if applicable
|
||||
@@ -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: b358818c1a...63b6cd3461
106
assets/ollama/Dockerfile
Normal file
106
assets/ollama/Dockerfile
Normal file
@@ -0,0 +1,106 @@
|
||||
# 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"]
|
||||
163
flake.lock
generated
163
flake.lock
generated
@@ -10,11 +10,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754337839,
|
||||
"narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=",
|
||||
"lastModified": 1770165109,
|
||||
"narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "856df6f6922845abd4fd958ce21febc07ca2fa45",
|
||||
"rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -23,6 +23,20 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751685974,
|
||||
"narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",
|
||||
"rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -44,13 +58,131 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nix2container": "nix2container",
|
||||
"nix_2_18": "nix_2_18",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-regression": "nixpkgs-regression",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774721317,
|
||||
"narHash": "sha256-KS0ElyhZKdUFcfaxfwid3yi2Id3EP9i+dGL16/wx1T8=",
|
||||
"ref": "main",
|
||||
"rev": "d0190cff6f2314cc1c727ff113aea20e086f4bcc",
|
||||
"revCount": 19103,
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/lix"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.lix.systems/lix-project/lix"
|
||||
}
|
||||
},
|
||||
"lowdown-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1633514407,
|
||||
"narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
|
||||
"owner": "kristapsdz",
|
||||
"repo": "lowdown",
|
||||
"rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "kristapsdz",
|
||||
"repo": "lowdown",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix2container": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1767195068,
|
||||
"narHash": "sha256-+OMnL79ZjqM/PCz2hoQ12MnXNoSSfBGnsYBOZnA9XbI=",
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"rev": "bb6801be998ba857a62c002cb77ece66b0a57298",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nlewo",
|
||||
"repo": "nix2container",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix_2_18": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"lix",
|
||||
"flake-compat"
|
||||
],
|
||||
"lowdown-src": "lowdown-src",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-regression": [
|
||||
"lix",
|
||||
"nixpkgs-regression"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730375271,
|
||||
"narHash": "sha256-RrOFlDGmRXcVRV2p2HqHGqvzGNyWoD0Dado/BNlJ1SI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nix",
|
||||
"rev": "0f665ff6779454f2117dcc32e44380cda7f45523",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "2.18.9",
|
||||
"repo": "nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1753939845,
|
||||
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
|
||||
"lastModified": 1705033721,
|
||||
"narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-23.05-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-regression": {
|
||||
"locked": {
|
||||
"lastModified": 1643052045,
|
||||
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "94def634a20494ee057c76998843c015909d6311",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -60,10 +192,27 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1769939035,
|
||||
"narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "a8ca480175326551d6c4121498316261cbb5b260",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"nixpkgs": "nixpkgs"
|
||||
"lix": "lix",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
||||
75
flake.nix
75
flake.nix
@@ -8,21 +8,39 @@
|
||||
inputs.darwin.follows = "";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
lix = {
|
||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-uconsole = {
|
||||
url = "github:nixos-uconsole/nixos-uconsole";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-raspberrypi = {
|
||||
url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
self.submodules = true;
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, agenix, ... }@inputs:
|
||||
outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
keys = import ./lib/keys.nix;
|
||||
paths = {
|
||||
flake = "/home/gortium/infra";
|
||||
identities = [ "/home/gortium/.ssh/gortium_ssh_key" "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
identities = [
|
||||
"/home/gortium/.ssh/gortium_ssh_key"
|
||||
"/etc/ssh/ssh_host_ed25519_key"
|
||||
"/root/.age/bootstrap.key" ];
|
||||
};
|
||||
overlays = [ agenix.overlays.default ];
|
||||
overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"openclaw-2026.3.12"
|
||||
];
|
||||
};
|
||||
|
||||
devShell = import ./shells/nix_dev.nix {
|
||||
@@ -32,14 +50,59 @@
|
||||
{
|
||||
nixosConfigurations = {
|
||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit system self keys paths; };
|
||||
specialArgs = { inherit system self keys paths inputs; };
|
||||
modules = [
|
||||
{ nixpkgs.overlays = overlays; }
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.rocmSupport = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"openclaw-2026.3.12"
|
||||
];
|
||||
nix.package = lix.packages.${system}.default;
|
||||
}
|
||||
agenix.nixosModules.default
|
||||
./hosts/lazyworkhorse/configuration.nix
|
||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||
./modules/default.nix
|
||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||
./modules/nixos/services/docker_manager.nix
|
||||
./modules/nixos/services/open_code_server.nix
|
||||
./modules/nixos/services/ollama_init_custom_models.nix
|
||||
./modules/nixos/services/openclaw_node.nix
|
||||
./modules/nixos/services/rollback-sentinel.nix
|
||||
./modules/nixos/security/ai-worker-restricted.nix
|
||||
./users/gortium.nix
|
||||
./users/ai-worker.nix
|
||||
];
|
||||
};
|
||||
|
||||
cyt-pi = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit self keys paths inputs; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nix.package = lix.packages."aarch64-linux".default;
|
||||
}
|
||||
./hosts/cyt-pi/configuration.nix
|
||||
./hosts/cyt-pi/hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
|
||||
uConsole = nixos-raspberrypi.lib.nixosSystem {
|
||||
specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
|
||||
modules = [
|
||||
{
|
||||
nixpkgs.overlays = overlays;
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.hostPlatform = "aarch64-linux";
|
||||
nix.package = lix.packages."aarch64-linux".default;
|
||||
}
|
||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||
nixos-uconsole.nixosModules.uconsole-cm5
|
||||
./hosts/uConsole/configuration.nix
|
||||
./hosts/uConsole/hardware-configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
98
hosts/cyt-pi/configuration.nix
Normal file
98
hosts/cyt-pi/configuration.nix
Normal file
@@ -0,0 +1,98 @@
|
||||
{ config, lib, pkgs, paths, self, ... }:
|
||||
|
||||
{
|
||||
# Basic Host Info
|
||||
networking.hostName = "cyt-pi";
|
||||
time.timeZone = "America/Montreal";
|
||||
i18n.defaultLocale = "en_CA.UTF-8";
|
||||
|
||||
# System State
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
# Boot & Hardware (Pi Zero 2 W is ARM64)
|
||||
boot.loader.grub.enable = false;
|
||||
boot.loader.generic-extlinux-compatible.enable = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# Networking
|
||||
networking.networkmanager.enable = true;
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings.PermitRootLogin = "prohibit-password";
|
||||
};
|
||||
|
||||
# User
|
||||
users.users.gortium = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "kismet" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
# Populate with your public key
|
||||
];
|
||||
};
|
||||
|
||||
# CYT Project Dependencies (Headless)
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
python311
|
||||
python311Packages.opencv4
|
||||
python311Packages.numpy
|
||||
python311Packages.pillow
|
||||
autossh # For the reverse tunnel
|
||||
kismet # Wi-Fi monitoring
|
||||
];
|
||||
|
||||
# Kismet Service
|
||||
systemd.services.kismet = {
|
||||
description = "Kismet Wi-Fi Monitor";
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "gortium";
|
||||
Group = "kismet";
|
||||
ExecStart = ''
|
||||
${pkgs.kismet}/bin/kismet -c panda --log-base=/home/gortium/kismet_logs --no-nc-ui
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = "10s";
|
||||
};
|
||||
};
|
||||
|
||||
# Reverse SSH Tunnel Service
|
||||
systemd.services.cyt-tunnel = {
|
||||
description = "Reverse SSH Tunnel to lazyworkhorse.net";
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "gortium";
|
||||
ExecStart = ''
|
||||
${pkgs.autossh}/bin/autossh -M 0 -N \
|
||||
-o "ServerAliveInterval 30" \
|
||||
-o "ServerAliveCountMax 3" \
|
||||
-R 19999:localhost:22 \
|
||||
gortium@lazyworkhorse.net -p 2425 \
|
||||
-i /home/gortium/.ssh/cyt_tunnel_key
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = "10s";
|
||||
};
|
||||
};
|
||||
|
||||
# CYT Application Service
|
||||
systemd.services.cyt-app = {
|
||||
description = "Chasing Your Tail - Target Detector";
|
||||
after = [ "network-online.target" "kismet.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "gortium";
|
||||
WorkingDirectory = "/home/gortium/Chasing-Your-Tail-NG";
|
||||
ExecStart = ''
|
||||
${pkgs.python311}/bin/python3 target_detector_cli.py --min-ssids 2
|
||||
'';
|
||||
Restart = "on-failure";
|
||||
RestartSec = "60s";
|
||||
Environment = [
|
||||
"CYT_KISMET_LOGS=/home/gortium/kismet_logs"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
24
hosts/cyt-pi/hardware-configuration.nix
Normal file
24
hosts/cyt-pi/hardware-configuration.nix
Normal file
@@ -0,0 +1,24 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
# Pi Zero 2 W specific filesystem
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/NIXOS_SD";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
}
|
||||
@@ -1,22 +1,22 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, self, paths, keys, ... }:
|
||||
{ config, lib, pkgs, paths, self, keys, ... }:
|
||||
|
||||
{
|
||||
# NAS Mounting
|
||||
hoardingcow-mount.enable = true;
|
||||
|
||||
# Flakesss
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||
|
||||
# Garbage collection
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "daily"; # You can also use "daily" or a cron-like spec
|
||||
options = "--delete-older-than 7d"; # Keep only 7 days of unreferenced data
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
|
||||
nix.settings = {
|
||||
@@ -29,12 +29,46 @@
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = false;
|
||||
|
||||
# 1. Force the kernel to ignore BIOS resource locks
|
||||
boot.kernelParams = [
|
||||
"acpi_enforce_resources=lax"
|
||||
"nct6775.force_id=0xd120" # This forces the driver to ignore BIOS locks for NCT6116
|
||||
"transparent_hugepage=always" # because mucho ram
|
||||
];
|
||||
# 2. Load the specific drivers found by sensors-detect
|
||||
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
|
||||
'';
|
||||
|
||||
boot.blacklistedKernelModules = [ "eeepc_wmi" ];
|
||||
networking.hostName = "lazyworkhorse"; # Define your hostname.
|
||||
# Pick only one of the below networking options.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
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;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Montreal";
|
||||
|
||||
@@ -56,31 +90,14 @@
|
||||
LC_CTYPE = "en_CA.UTF-8";
|
||||
};
|
||||
|
||||
# Private host ssh key
|
||||
age = {
|
||||
identityPaths = paths.identities;
|
||||
secrets = {
|
||||
lazyworkhorse_host_ssh_key = {
|
||||
file = "${self}/secrets/lazyworkhorse_host_ssh_key.age";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0600";
|
||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||
};
|
||||
};
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
autosuggestions.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
enableCompletion = true;
|
||||
|
||||
setOptions = [ "HIST_IGNORE_ALL_DUPS" "SHARE_HISTORY" ];
|
||||
};
|
||||
|
||||
# Public host ssh key
|
||||
environment.etc."ssh/ssh_host_ed25519_key.pub".text = keys.hosts.lazyworkhorse.main;
|
||||
|
||||
# Prevent sshd from generating new keys and use this one
|
||||
services.openssh.hostKeys = [
|
||||
{
|
||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||
type = "ed25519";
|
||||
}
|
||||
];
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
@@ -108,6 +125,7 @@
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
# Nix Helper cli tool
|
||||
environment.sessionVariables = {
|
||||
NH_FLAKE = paths.flake;
|
||||
};
|
||||
@@ -118,18 +136,29 @@
|
||||
# nvim please
|
||||
environment.variables.EDITOR = "nvim";
|
||||
|
||||
# programs.firefox.enable = true;
|
||||
|
||||
# List packages installed in system profile.
|
||||
# You can use https://Search.nixos.org/ to find more packages (and options).
|
||||
environment.systemPackages = with pkgs; [
|
||||
agenix
|
||||
neovim
|
||||
docker-compose
|
||||
wget
|
||||
age
|
||||
agenix
|
||||
git
|
||||
nh
|
||||
lm_sensors
|
||||
rocmPackages.rocminfo
|
||||
rocmPackages.rocm-smi
|
||||
nvtopPackages.amd
|
||||
clinfo
|
||||
ncurses
|
||||
kitty.terminfo
|
||||
nodejs_22
|
||||
uv
|
||||
openclaw
|
||||
(python3.withPackages (ps: with ps; [
|
||||
openai-whisper
|
||||
]))
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
@@ -142,10 +171,205 @@
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# Enable the OpenSSH daemon
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings.PermitRootLogin = "no";
|
||||
ports = [ 2424 ];
|
||||
settings = {
|
||||
PasswordAuthentication = false;
|
||||
KbdInteractiveAuthentication = false;
|
||||
# Additional hardening settings below in SERVER HARDENING section
|
||||
};
|
||||
hostKeys = [
|
||||
{
|
||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||
type = "ed25519";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.dockerStacks = {
|
||||
versioncontrol = {
|
||||
path = self + "/assets/compose/versioncontrol";
|
||||
ports = [ 2222 ];
|
||||
};
|
||||
|
||||
network = {
|
||||
path = self + "/assets/compose/network";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
ports = [ 80 443 ];
|
||||
};
|
||||
|
||||
passwordmanager = {
|
||||
path = self + "/assets/compose/passwordmanager";
|
||||
};
|
||||
|
||||
ai = {
|
||||
path = self + "/assets/compose/ai";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
ports = [ 22000 ]; # Syncthing TCP sync
|
||||
};
|
||||
|
||||
cloudstorage = {
|
||||
path = self + "/assets/compose/cloudstorage";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
homeautomation = {
|
||||
path = self + "/assets/compose/homeautomation";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
authentification = {
|
||||
path = self + "/assets/compose/authentification";
|
||||
};
|
||||
|
||||
backup = {
|
||||
path = self + "/assets/compose/backup";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
coms = {
|
||||
path = self + "/assets/compose/coms";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
finance = {
|
||||
path = self + "/assets/compose/finance";
|
||||
};
|
||||
|
||||
homepage = {
|
||||
path = self + "/assets/compose/homepage";
|
||||
};
|
||||
|
||||
vpn = {
|
||||
path = self + "/assets/compose/vpn";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
# tak = {
|
||||
# path = self + "/assets/compose/tak";
|
||||
# };
|
||||
};
|
||||
|
||||
services.opencode = {
|
||||
enable = true;
|
||||
port = 4099;
|
||||
ollamaUrl = "http://127.0.0.1:11434/v1";
|
||||
};
|
||||
|
||||
# Private host ssh key managed by agenix
|
||||
age = {
|
||||
identityPaths = paths.identities;
|
||||
secrets = {
|
||||
containers_env = {
|
||||
file = ../../secrets/containers.env.age;
|
||||
path = "/run/secrets/containers.env";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
};
|
||||
lazyworkhorse_host_ssh_key = {
|
||||
file = ../../secrets/lazyworkhorse_host_ssh_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0600";
|
||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||
};
|
||||
ai_ssh_key = {
|
||||
file = ../../secrets/ai_ssh_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0600";
|
||||
path = "/home/ai-worker/.ssh/ai_ssh_key";
|
||||
};
|
||||
openclaw_gateway_token = {
|
||||
file = ../../secrets/openclaw_gateway_token.age;
|
||||
owner = "root";
|
||||
group = "ai-worker";
|
||||
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";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# 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)
|
||||
environment.etc."ssh/ssh_host_ed25519_key.pub".text =
|
||||
"${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.zfs.autoSnapshot.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
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true; # Useful for some compatibility layers
|
||||
extraPackages = with pkgs; [
|
||||
rocmPackages.clr.icd # OpenCL/HIP runtime
|
||||
];
|
||||
};
|
||||
nixpkgs.config.rocmTargets = [ "gfx906" ];
|
||||
environment.variables = {
|
||||
# This "tricks" ROCm into supporting the MI50 if using newer versions
|
||||
HSA_OVERRIDE_GFX_VERSION = "9.0.6";
|
||||
# Ensures the system sees both GPUs
|
||||
HIP_VISIBLE_DEVICES = "0,1";
|
||||
};
|
||||
|
||||
# Open ports in the firewall.
|
||||
@@ -154,6 +378,203 @@
|
||||
# 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 = ''
|
||||
# 1. Wipe the INPUT chain clean at the start of every activation
|
||||
iptables -F INPUT
|
||||
|
||||
# Rate limit SSH connections (max 20 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 20 -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
|
||||
|
||||
# 3. CRITICAL: Re-link the NixOS default firewall chain
|
||||
# Without this line, the 'allowedTCPPorts' in your Nix config will be ignored!
|
||||
iptables -A INPUT -j nixos-fw
|
||||
'';
|
||||
};
|
||||
|
||||
# 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 = 20;
|
||||
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.
|
||||
|
||||
167
hosts/uConsole/configuration.nix
Normal file
167
hosts/uConsole/configuration.nix
Normal file
@@ -0,0 +1,167 @@
|
||||
{ config, lib, pkgs, paths, self, ... }:
|
||||
|
||||
{
|
||||
# Basic Host Info
|
||||
networking.hostName = "uConsole";
|
||||
time.timeZone = "America/Montreal";
|
||||
i18n.defaultLocale = "en_CA.UTF-8";
|
||||
|
||||
# System State
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
# Boot & Hardware (uconsole-cm5 module handles boot.loader)
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
# Networking
|
||||
networking.networkmanager.enable = true;
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
settings.PermitRootLogin = "prohibit-password";
|
||||
settings.PasswordAuthentication = false;
|
||||
};
|
||||
|
||||
# User
|
||||
users.users.gortium = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "video" "dialout" "kismet" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.gortium.main
|
||||
keys.users.gortium.gitea
|
||||
];
|
||||
};
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "gortium" ];
|
||||
commands = [
|
||||
{
|
||||
command = "ALL";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
|
||||
# ============================================================
|
||||
# Package groups
|
||||
# ============================================================
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# ===== Base =====
|
||||
emacs-pgtk
|
||||
git
|
||||
ripgrep
|
||||
fd
|
||||
htop
|
||||
tmux
|
||||
neovim
|
||||
|
||||
# ===== HAM Radio =====
|
||||
js8call
|
||||
wsjtx
|
||||
fldigi
|
||||
pat # Winlink client
|
||||
direwolf # AX.25 packet modem
|
||||
chirp # Radio programming tool
|
||||
hamlib # Ham radio control libraries
|
||||
trustedqsl # Logbook of the World (LoTW)
|
||||
|
||||
# ===== SDR / RF =====
|
||||
sdrpp # SDR++ spectrum analyzer
|
||||
gqrx # SDR receiver GUI
|
||||
rtl-sdr # RTL-SDR drivers & utilities
|
||||
inspectrum # Offline signal analysis
|
||||
soapysdr-with-plugins # SoapySDR + hardware support plugins
|
||||
|
||||
# ===== Mesh / LoRa =====
|
||||
meshtastic # Python CLI for Meshtastic devices
|
||||
reticulumStack # Reticulum Network Stack (rnsd, rnsh, rncp, rnx, rnpath, etc.)
|
||||
lxmf # LXMF messaging protocol
|
||||
nomadnet # Nomad Network client
|
||||
|
||||
# ===== Security =====
|
||||
nmap
|
||||
aircrack-ng
|
||||
kismet # Wi-Fi monitor / IDS
|
||||
bettercap # MITM/network attack framework
|
||||
wireshark # Packet analyzer
|
||||
hashcat # GPU password cracker
|
||||
john # John the Ripper
|
||||
sqlmap # SQL injection tool
|
||||
|
||||
# ===== GPS / Maps =====
|
||||
foxtrotgps
|
||||
viking # GPS map editor
|
||||
gpsbabel # GPS data conversion
|
||||
];
|
||||
|
||||
# Packages noted but not in unstable nixpkgs:
|
||||
# - metasploit: unfree; install manually via Git clone
|
||||
# - burpsuite: unfree Java app (Community Edition available for download)
|
||||
# - sidechannel: not a distinct PyPI package; functionality covered by
|
||||
# the Reticulum stack. For LXMF GUI client, install Sideband manually
|
||||
# from github.com/markqvist/Sideband
|
||||
|
||||
# ============================================================
|
||||
# Reticulum Service (rnsd)
|
||||
# ============================================================
|
||||
systemd.services.rnsd = {
|
||||
description = "Reticulum Network Stack Daemon";
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "gortium";
|
||||
Group = "gortium";
|
||||
ExecStart = "${pkgs.reticulumStack}/bin/rnsd";
|
||||
Restart = "always";
|
||||
RestartSec = "10s";
|
||||
LimitNOFILE = 65536;
|
||||
};
|
||||
};
|
||||
|
||||
# ============================================================
|
||||
# Kismet Service (Wi-Fi monitoring / mesh node)
|
||||
# ============================================================
|
||||
systemd.services.kismet = {
|
||||
description = "Kismet Wi-Fi Monitor & IDS";
|
||||
after = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = "gortium";
|
||||
Group = "kismet";
|
||||
ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-base=/home/gortium/kismet_logs --no-nc-ui";
|
||||
Restart = "always";
|
||||
RestartSec = "10s";
|
||||
};
|
||||
};
|
||||
|
||||
# ============================================================
|
||||
# Kernel modules for SDR and radio
|
||||
# ============================================================
|
||||
boot.kernelModules = [
|
||||
"88x2bu" # Realtek 8812/8821BU USB WiFi (common adapter)
|
||||
"rtl8xxxu" # RTL8188/8192/8723 USB WiFi
|
||||
"rtl2832_sdr" # RTL-SDR kernel module
|
||||
"dvb_usb_rtl28xxu" # RTL-SDR DVB-T
|
||||
];
|
||||
|
||||
boot.blacklistedKernelModules = [ ];
|
||||
|
||||
# ============================================================
|
||||
# Extra udev rules for SDR and HAM radio devices
|
||||
# ============================================================
|
||||
services.udev.packages = with pkgs; [ rtl-sdr ];
|
||||
|
||||
# ============================================================
|
||||
# Enable IPv6 for Reticulum mesh
|
||||
# ============================================================
|
||||
networking.enableIPv6 = true;
|
||||
|
||||
# ============================================================
|
||||
# Firewall: open ports for Reticulum (optional)
|
||||
# ============================================================
|
||||
networking.firewall.allowedTCPPorts = [ 22 ]; # SSH only
|
||||
networking.firewall.allowedUDPPorts = [ ];
|
||||
# Reticulum uses its own encryption and doesn't need open ports
|
||||
# for basic mesh operations (peer-to-peer discovery).
|
||||
# For TCP interfaces, open additional ports as needed.
|
||||
}
|
||||
26
hosts/uConsole/hardware-configuration.nix
Normal file
26
hosts/uConsole/hardware-configuration.nix
Normal file
@@ -0,0 +1,26 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
# uConsole CM5 uses NVMe or eMMC for boot storage
|
||||
# The uconsole-cm5 module sets up /boot/firmware and default /
|
||||
# Override device label here if using different storage
|
||||
fileSystems."/" = lib.mkDefault {
|
||||
device = "/dev/disk/by-label/NIXOS_UCM5";
|
||||
fsType = "ext4";
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||
}
|
||||
@@ -5,6 +5,10 @@
|
||||
github = "";
|
||||
gitea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN9tKezYidZglWBRI9/2I/cBGUUHj2dHY8rHXppYmf7F";
|
||||
};
|
||||
|
||||
ai-worker = {
|
||||
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf";
|
||||
};
|
||||
};
|
||||
|
||||
hosts = {
|
||||
@@ -12,6 +16,7 @@
|
||||
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmPv4JssvhHGIx85UwFxDSrL5anR4eXB/cd9V2i9wdW";
|
||||
github = "";
|
||||
gitea = "";
|
||||
bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports =
|
||||
[
|
||||
# ./home
|
||||
./nixos
|
||||
];
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports =
|
||||
[
|
||||
./graphical-desktop.nix
|
||||
];
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports =
|
||||
[
|
||||
./bundles
|
||||
# ./programs
|
||||
./services
|
||||
./filesystem
|
||||
./services/systemd
|
||||
];
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports =
|
||||
[
|
||||
./hoardingcow-mount.nix
|
||||
];
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
|
||||
options = {
|
||||
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow acces";
|
||||
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow access";
|
||||
};
|
||||
config = lib.mkIf config.hoardingcow-mount.enable {
|
||||
fileSystems."/mnt/HoardingCow_docker_data" = {
|
||||
|
||||
105
modules/nixos/security/README-ai-worker.md
Normal file
105
modules/nixos/security/README-ai-worker.md
Normal file
@@ -0,0 +1,105 @@
|
||||
# AI Worker Restricted Access
|
||||
|
||||
This module provides SSH access for the AI worker (hermes-agent) to run ollama benchmarks on the host.
|
||||
|
||||
## Security Model
|
||||
|
||||
The `ai-worker` user has:
|
||||
|
||||
### Filesystem Access
|
||||
- **Home directory**: `/home/ai-worker` (standard user home)
|
||||
- **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
|
||||
- **Cannot access**: Any files outside standard system paths
|
||||
|
||||
### Sudo Access
|
||||
- **NONE**: ai-worker has no sudo privileges
|
||||
- Cannot run `nh`, `nixos-rebuild`, `nixpkgs-fmt`, or `nix` with elevated permissions
|
||||
|
||||
### Docker Access
|
||||
- Member of `docker` group - can run `docker` and `docker exec` commands
|
||||
- Primary use: `docker exec ollama ollama ...` for benchmarking
|
||||
- Can run `docker exec --privileged ollama rocm-smi ...` for VRAM monitoring
|
||||
|
||||
## Workflow: SSH + Docker Benchmarking
|
||||
|
||||
The AI worker connects from the Hermes container to the host via SSH, runs ollama benchmarks, then returns to save results.
|
||||
|
||||
### Example Workflow
|
||||
|
||||
```bash
|
||||
# From Hermes container, SSH to host
|
||||
ssh -i /path/to/ssh/key ai-worker@host.docker.internal
|
||||
|
||||
# On host, run ollama benchmarks via docker
|
||||
docker exec ollama ollama pull devstral-small-2:24b
|
||||
|
||||
# Create test modelfile
|
||||
docker exec ollama bash -c 'cat <<EOF > /root/.ollama/test.modelfile
|
||||
FROM devstral-small-2:24b
|
||||
PARAMETER num_ctx 65536
|
||||
PARAMETER num_gpu 99
|
||||
PARAMETER flash_attn true
|
||||
EOF'
|
||||
|
||||
# Create and test model
|
||||
docker exec ollama ollama create test-model -f /root/.ollama/test.modelfile
|
||||
docker exec ollama ollama run test-model "Write a Python async function"
|
||||
|
||||
# Check VRAM usage
|
||||
docker exec --privileged ollama rocm-smi --showmeminfo vram
|
||||
|
||||
# Cleanup
|
||||
docker exec ollama ollama rm test-model
|
||||
|
||||
# Exit SSH, return to Hermes container
|
||||
exit
|
||||
|
||||
# Save results in Hermes container
|
||||
# /opt/data/ai-optimizer/state.json
|
||||
# /opt/data/ai-optimizer/results.csv
|
||||
```
|
||||
|
||||
## SSH Access
|
||||
|
||||
Connect as:
|
||||
```bash
|
||||
ssh ai-worker@lazyworkhorse
|
||||
```
|
||||
|
||||
The working directory will be `/home/ai-worker`. No infra repo access.
|
||||
|
||||
## Verification
|
||||
|
||||
Check ai-worker permissions:
|
||||
```bash
|
||||
# On the host, as root or gortium:
|
||||
sudo -u ai-worker sudo -l
|
||||
# Should show: no sudo access
|
||||
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
# Should show: ai-worker docker
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
If ai-worker cannot run docker commands:
|
||||
```bash
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
|
||||
# Verify ollama container is running
|
||||
docker ps | grep ollama
|
||||
|
||||
# Test docker access
|
||||
sudo -u ai-worker docker exec ollama ollama list
|
||||
```
|
||||
|
||||
If SSH connection fails:
|
||||
```bash
|
||||
# Check SSH key is authorized
|
||||
cat /home/ai-worker/.ssh/authorized_keys
|
||||
|
||||
# Check SSH service
|
||||
systemctl status sshd
|
||||
```
|
||||
17
modules/nixos/security/ai-worker-restricted.nix
Normal file
17
modules/nixos/security/ai-worker-restricted.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.services.aiWorkerAccess = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable AI worker SSH access with docker group membership for ollama benchmarking";
|
||||
};
|
||||
|
||||
config = mkIf config.services.aiWorkerAccess {
|
||||
# ai-worker is member of docker group - can run docker commands via SSH
|
||||
# No bind mounts, no sudo access - docker-only for ollama benchmarking
|
||||
users.groups.docker.members = [ "ai-worker" ];
|
||||
};
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{ pkgs, lib, config, ... }: {
|
||||
imports =
|
||||
[
|
||||
./systemd
|
||||
];
|
||||
}
|
||||
57
modules/nixos/services/docker_manager.nix
Normal file
57
modules/nixos/services/docker_manager.nix
Normal file
@@ -0,0 +1,57 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.services.dockerStacks = mkOption {
|
||||
type = types.attrsOf (types.submodule {
|
||||
options = {
|
||||
path = mkOption { type = types.str; };
|
||||
envFile = mkOption { type = types.nullOr types.path; default = null; };
|
||||
ports = mkOption { type = types.listOf types.int; default = [ ]; };
|
||||
# New option to pass raw systemd serviceConfig
|
||||
serviceConfig = mkOption {
|
||||
type = types.attrs;
|
||||
default = { };
|
||||
description = "Extra systemd serviceConfig options for this stack.";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = { };
|
||||
};
|
||||
|
||||
config = {
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.daemon.settings.dns = [ "1.1.1.1" "8.8.8.8" ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = flatten (mapAttrsToList (name: value: value.ports) config.services.dockerStacks);
|
||||
|
||||
systemd.services = mapAttrs' (name: value: nameValuePair "${name}_stack" {
|
||||
description = "Docker Compose stack: ${name}";
|
||||
|
||||
# Forces systemd to restart when the files change
|
||||
reloadTriggers = [
|
||||
"${builtins.hashFile "sha256" (toString value.path + "/compose.yml")}"
|
||||
] ++ (lib.optional (value.envFile != null) "${value.envFile}");
|
||||
|
||||
after = [ "network.target" "docker.service" "docker.socket" "agenix.service" ];
|
||||
wants = [ "docker.socket" "agenix.service" ];
|
||||
requires = [ "docker.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
path = with pkgs; [ git docker docker-compose bash ];
|
||||
|
||||
# We merge the base config with the custom 'serviceConfig' from the submodule
|
||||
serviceConfig = recursiveUpdate {
|
||||
Type = "oneshot";
|
||||
WorkingDirectory = value.path;
|
||||
User = "root";
|
||||
ExecStartPre = "${pkgs.bash}/bin/bash -c 'while [ ! -S /var/run/docker.sock ]; do sleep 1; done'";
|
||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d --remove-orphans";
|
||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||
RemainAfterExit = true;
|
||||
EnvironmentFile = mkIf (value.envFile != null) [ value.envFile ];
|
||||
} value.serviceConfig;
|
||||
}) config.services.dockerStacks;
|
||||
};
|
||||
}
|
||||
400
modules/nixos/services/nixos-rollback.sh
Executable file
400
modules/nixos/services/nixos-rollback.sh
Executable file
@@ -0,0 +1,400 @@
|
||||
#!/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 "$@"
|
||||
87
modules/nixos/services/ollama_init_custom_models.nix
Normal file
87
modules/nixos/services/ollama_init_custom_models.nix
Normal file
@@ -0,0 +1,87 @@
|
||||
{ pkgs, ... }: {
|
||||
systemd.services.init-ollama-model = {
|
||||
description = "Initialize LLM models with extra context in Ollama Docker";
|
||||
|
||||
# On s'assure que Docker tourne avant de lancer ce script
|
||||
after = [ "docker.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
script = ''
|
||||
# Fonction de création asynchrone pour ne pas bloquer le démarrage
|
||||
(
|
||||
echo "Starting asynchronous Ollama initialization..."
|
||||
|
||||
# Attente d'Ollama (maximum 120 secondes pour éviter une boucle infinie)
|
||||
TIMEOUT=60
|
||||
COUNT=0
|
||||
while ! ${pkgs.curl}/bin/curl -s -f http://127.0.0.1:11434/api/tags > /dev/null; do
|
||||
if [ $COUNT -ge $TIMEOUT ]; then
|
||||
echo "Ollama did not become ready in time. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
echo "Waiting for Ollama API to be reachable..."
|
||||
sleep 5
|
||||
COUNT=$((COUNT + 5))
|
||||
done
|
||||
|
||||
create_model_if_missing() {
|
||||
local model_name=$1
|
||||
local base_model=$2
|
||||
|
||||
# Vérification robuste via l'API HTTP d'Ollama plutôt que docker exec (évite les conflits de tty)
|
||||
if ! ${pkgs.curl}/bin/curl -s http://127.0.0.1:11434/api/tags | ${pkgs.jq}/bin/jq -e ".models[] | select(.name == \"$model_name\")" > /dev/null; then
|
||||
echo "$model_name not found, creating from $base_model..."
|
||||
|
||||
# Utilisation d'un fichier temporaire sur l'hôte pour l'injecter proprement dans Docker
|
||||
TMP_FILE=$(mktemp)
|
||||
cat <<EOF > "$TMP_FILE"
|
||||
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
|
||||
PARAMETER repeat_penalty 1.1
|
||||
PARAMETER top_k 40
|
||||
PARAMETER stop "[INST]"
|
||||
PARAMETER stop "[/INST]"
|
||||
PARAMETER stop "</s>"
|
||||
EOF
|
||||
|
||||
# Copie et création dans le conteneur
|
||||
${pkgs.docker}/bin/docker cp "$TMP_FILE" ollama:/tmp/model.modelfile
|
||||
${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f /tmp/model.modelfile
|
||||
${pkgs.docker}/bin/docker exec ollama rm /tmp/model.modelfile
|
||||
rm -f "$TMP_FILE"
|
||||
else
|
||||
echo "$model_name already exists, skipping."
|
||||
fi
|
||||
}
|
||||
|
||||
# Create Nemotron
|
||||
create_model_if_missing "nemotron-3-nano:30b-128k" "nemotron-3-nano:30b"
|
||||
|
||||
# Create Devstral
|
||||
create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b"
|
||||
|
||||
) &
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "forking"; # Permet à systemd de savoir que le script passe en arrière-plan via '&'
|
||||
User = "root";
|
||||
};
|
||||
};
|
||||
}
|
||||
145
modules/nixos/services/open_code_server.nix
Normal file
145
modules/nixos/services/open_code_server.nix
Normal file
@@ -0,0 +1,145 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.opencode;
|
||||
in {
|
||||
options.services.opencode = {
|
||||
enable = lib.mkEnableOption "OpenCode AI Service";
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 4099;
|
||||
};
|
||||
ollamaUrl = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "http://127.0.0.1:11434/v1";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
environment.etc."opencode/opencode.json".text = builtins.toJSON {
|
||||
"$schema" = "https://opencode.ai/config.json";
|
||||
"model" = "nemotron-3-nano-llama_cpp";
|
||||
"mcp" = {
|
||||
"context7" = {
|
||||
"type" = "remote";
|
||||
"url" = "https://mcp.context7.com/mcp";
|
||||
};
|
||||
"duckduckgo" = {
|
||||
"type" = "local";
|
||||
"command" = [ "uvx" "duckduckgo-mcp-server" ];
|
||||
"environment" = {
|
||||
"PATH" = "/run/current-system/sw/bin:/home/gortium/.nix-profile/bin";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
"provider" = {
|
||||
"llamacpp" = {
|
||||
"name" = "Llama.cpp (Local MI50)";
|
||||
"npm" = "@ai-sdk/openai-compatible";
|
||||
"options" = {
|
||||
"baseURL" = "http://localhost:8300/v1";
|
||||
"apiKey" = "not-needed";
|
||||
"maxTokens" = 80000;
|
||||
};
|
||||
"models" = {
|
||||
"devstral-2-small-llama_cpp" = {
|
||||
"name" = "Devstral 2 small 24B Q8 (llama.cpp)";
|
||||
"tools" = true;
|
||||
"reasoning" = false;
|
||||
};
|
||||
"nemotron-3-nano-llama_cpp" = {
|
||||
"name" = "Nemotron 3 nano 30B Q8 (llama.cpp)";
|
||||
"tools" = true;
|
||||
"reasoning" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
"ollama" = {
|
||||
"name" = "Ollama (Local)";
|
||||
"npm" = "@ai-sdk/openai-compatible";
|
||||
"options" = {
|
||||
"baseURL" = cfg.ollamaUrl;
|
||||
"headers" = { "Content-Type" = "application/json"; };
|
||||
};
|
||||
"models" = {
|
||||
"devstral-small-2:24b-128k" = {
|
||||
"name" = "Mistral Devstral Small 2 (Ollama)";
|
||||
"tools" = true;
|
||||
"reasoning" = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.opencode-gsd-install = {
|
||||
description = "Install Get Shit Done OpenCode Components";
|
||||
after = [ "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [
|
||||
nodejs
|
||||
git
|
||||
coreutils
|
||||
bash
|
||||
];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "gortium";
|
||||
RemainAfterExit = true;
|
||||
Environment = [
|
||||
"HOME=/home/gortium"
|
||||
"SHELL=${pkgs.bash}/bin/bash"
|
||||
"PATH=${lib.makeBinPath [ pkgs.nodejs pkgs.git pkgs.bash pkgs.coreutils ]}"
|
||||
];
|
||||
};
|
||||
script = ''
|
||||
# Check if the GSD directory exists
|
||||
if [ ! -d "/home/gortium/.config/opencode/gsd" ]; then
|
||||
echo "GSD not found. Installing..."
|
||||
${pkgs.nodejs}/bin/npx -y github:dbachelder/get-shit-done-opencode --global --force
|
||||
else
|
||||
echo "GSD already installed. Skipping auto-reinstall."
|
||||
echo "To force update, run: sudo systemctl restart opencode-gsd-install.service"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.opencode = {
|
||||
description = "OpenCode AI Coding Agent Server";
|
||||
after = [ "network.target" "ai_stack.service" "opencode-gsd-install.service" ];
|
||||
requires = [ "ai_stack.service" "opencode-gsd-install.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
path = with pkgs; [
|
||||
bash
|
||||
coreutils
|
||||
nodejs
|
||||
git
|
||||
nix
|
||||
ripgrep
|
||||
fd
|
||||
];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = "gortium";
|
||||
WorkingDirectory = "/home/gortium/infra";
|
||||
ExecStart = "${pkgs.nodejs}/bin/npx -y opencode-ai serve --hostname 0.0.0.0 --port ${toString cfg.port}";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
|
||||
environment = {
|
||||
OLLAMA_BASE_URL = "http://127.0.0.1:11434";
|
||||
OPENCODE_CONFIG = "/etc/opencode/opencode.json";
|
||||
HOME = "/home/gortium";
|
||||
NODE_PATH = "${pkgs.nodejs}/lib/node_modules";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ cfg.port ];
|
||||
};
|
||||
}
|
||||
64
modules/nixos/services/openclaw_node.nix
Normal file
64
modules/nixos/services/openclaw_node.nix
Normal file
@@ -0,0 +1,64 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.services.openclaw-node;
|
||||
openclawPkg = pkgs.openclaw;
|
||||
in {
|
||||
options.services.openclaw-node = {
|
||||
enable = lib.mkEnableOption "OpenClaw Node service";
|
||||
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "ai-worker";
|
||||
description = "User to run the OpenClaw headless node as.";
|
||||
};
|
||||
|
||||
gatewayHost = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "127.0.0.1";
|
||||
description = "Gateway host (IP or hostname).";
|
||||
};
|
||||
|
||||
gatewayPort = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 18789;
|
||||
description = "Gateway WebSocket port.";
|
||||
};
|
||||
|
||||
gatewayTokenFile = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "";
|
||||
description = "Path to file containing the gateway auth token.";
|
||||
};
|
||||
|
||||
displayName = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "lazyworkhorse-host";
|
||||
description = "Display name for this node (shown in pairing).";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
systemd.services.openclaw-node = {
|
||||
description = "OpenClaw Headless Node Service";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
User = cfg.user;
|
||||
Group = cfg.user;
|
||||
WorkingDirectory = "/home/${cfg.user}";
|
||||
ExecStart = ''
|
||||
${pkgs.bash}/bin/bash -c 'export OPENCLAW_GATEWAY_TOKEN=$(cat ${cfg.gatewayTokenFile}) && exec ${openclawPkg}/bin/openclaw node run --host ${cfg.gatewayHost} --port ${toString cfg.gatewayPort} --display-name "${cfg.displayName}"'
|
||||
'';
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
};
|
||||
|
||||
environment = {
|
||||
NODE_ENV = "production";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,9 +1,5 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib; let
|
||||
cfg = config.services.podman;
|
||||
in {
|
||||
|
||||
184
modules/nixos/services/rollback-sentinel.nix
Normal file
184
modules/nixos/services/rollback-sentinel.nix
Normal file
@@ -0,0 +1,184 @@
|
||||
{ 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
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
{ pkgs, lib, config, self, keys, paths, ... }: {
|
||||
imports =
|
||||
[
|
||||
./network.nix
|
||||
./passwordmanager.nix
|
||||
./versioncontrol.nix
|
||||
];
|
||||
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
daemon.settings = {
|
||||
"dns" = [ "1.1.1.1" "8.8.8.8" ];
|
||||
};
|
||||
};
|
||||
|
||||
age = {
|
||||
identityPaths = paths.identities;
|
||||
secrets = {
|
||||
containers_env = {
|
||||
file = self + "/secrets/containers.env.age";
|
||||
path = "/run/secrets/containers.env";
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
{ config, pkgs, self, ... }:
|
||||
|
||||
let
|
||||
network_compose_dir = pkgs.stdenv.mkDerivation {
|
||||
name = "network_compose_dir";
|
||||
src = self + "/assets/compose/network";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/* $out/
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
|
||||
systemd.services.network_stack = {
|
||||
description = "Traefik + DDNS updater via Docker Compose";
|
||||
after = [ "network-online.target" "docker.service" ];
|
||||
wants = [ "network-online.target" "docker.service" ];
|
||||
serviceConfig = {
|
||||
WorkingDirectory = "${network_compose_dir}";
|
||||
|
||||
EnvironmentFile = config.age.secrets.containers_env.path;
|
||||
|
||||
# Stop left over container by the same name
|
||||
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
||||
|
||||
# Start the services using Docker Compose
|
||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
||||
|
||||
# Stop and remove containers on shutdown
|
||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||
|
||||
RemainAfterExit = true;
|
||||
TimeoutStartSec = 0;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
{ config, pkgs, self, ... }:
|
||||
|
||||
let
|
||||
passwordmanager_compose_dir = pkgs.stdenv.mkDerivation {
|
||||
name = "passwordmanager_compose_dir";
|
||||
src = self + "/assets/compose/passwordmanager";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/* $out/
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
systemd.services.passwordmanager_stack = {
|
||||
description = "Bitwarden via Docker Compose";
|
||||
after = [ "network-online.target" "docker.service" ];
|
||||
wants = [ "network-online.target" "docker.service" ];
|
||||
serviceConfig = {
|
||||
WorkingDirectory = "${passwordmanager_compose_dir}";
|
||||
|
||||
# Stop left over container by the same name
|
||||
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
||||
|
||||
# Start the services using Docker Compose
|
||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
||||
|
||||
# Stop and remove containers on shutdown
|
||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||
|
||||
RemainAfterExit = true;
|
||||
TimeoutStartSec = 0;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
{ config, pkgs, self, ... }:
|
||||
|
||||
let
|
||||
versioncontrol_compose_dir = pkgs.stdenv.mkDerivation {
|
||||
name = "versioncontrol_compose_dir";
|
||||
src = self + "/assets/compose/versioncontrol";
|
||||
dontUnpack = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/* $out/
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [ 2222 ];
|
||||
|
||||
systemd.services.versioncontrol_stack = {
|
||||
description = "Gitea via Docker Compose";
|
||||
after = [ "network-online.target" "docker.service" ];
|
||||
wants = [ "network-online.target" "docker.service" ];
|
||||
serviceConfig = {
|
||||
WorkingDirectory = "${versioncontrol_compose_dir}";
|
||||
|
||||
# Stop left over container by the same name
|
||||
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
||||
|
||||
# Start the services using Docker Compose
|
||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
||||
|
||||
# Stop and remove containers on shutdown
|
||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||
|
||||
RemainAfterExit = true;
|
||||
TimeoutStartSec = 0;
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
}
|
||||
77
overlays/reticulum.nix
Normal file
77
overlays/reticulum.nix
Normal file
@@ -0,0 +1,77 @@
|
||||
final: prev: let
|
||||
python3 = final.python3;
|
||||
pyPkgs = python3.pkgs;
|
||||
in {
|
||||
reticulumStack = python3.pkgs.buildPythonApplication rec {
|
||||
pname = "reticulum";
|
||||
version = "1.2.9";
|
||||
src = pyPkgs.fetchPypi {
|
||||
pname = "rns";
|
||||
inherit version;
|
||||
sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75";
|
||||
};
|
||||
propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "RNS" ];
|
||||
meta = with final.lib; {
|
||||
description = "Self-configuring, encrypted and resilient mesh networking stack";
|
||||
homepage = "https://reticulum.network/";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
lxmf = python3.pkgs.buildPythonApplication rec {
|
||||
pname = "lxmf";
|
||||
version = "0.9.8";
|
||||
src = pyPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
|
||||
};
|
||||
propagatedBuildInputs = [ final.reticulumStack ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "LXMF" ];
|
||||
meta = with final.lib; {
|
||||
description = "Lightweight Extensible Message Format for Reticulum";
|
||||
homepage = "https://github.com/markqvist/lxmf";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
nomadnet = python3.pkgs.buildPythonApplication rec {
|
||||
pname = "nomadnet";
|
||||
version = "1.1.1";
|
||||
src = pyPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
|
||||
};
|
||||
propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nomadnet" ];
|
||||
meta = with final.lib; {
|
||||
description = "Nomad Network — resilient mesh communications platform";
|
||||
homepage = "https://github.com/markqvist/NomadNet";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
|
||||
rnsh = python3.pkgs.buildPythonApplication rec {
|
||||
pname = "rnsh";
|
||||
version = "0.1.7";
|
||||
src = pyPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
|
||||
};
|
||||
propagatedBuildInputs = [ final.reticulumStack ];
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "rnsh" ];
|
||||
meta = with final.lib; {
|
||||
description = "Remote shell over Reticulum";
|
||||
homepage = "https://github.com/acehoss/rnsh";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
};
|
||||
}
|
||||
BIN
secrets/ai_ssh_key.age
Normal file
BIN
secrets/ai_ssh_key.age
Normal file
Binary file not shown.
@@ -1,7 +1,36 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 GhMD8A 9Tjo08Hbj3S+nCdLUylZoUK6meXtuHq9F/qwSJZBYho
|
||||
iu2MmQ2VHm+QEvqGjkEy02V0cNRanAyhrA8Xu7UWRFk
|
||||
-> ssh-ed25519 eB5ENw 8UTi2pmZML1Zyh9zCfEx4JqJhQ1vM/jZCEhrkuc1Hh4
|
||||
et6FoN8E4tgo2DXlt/KTGLRsByJFyDu2oHA/Js/pIB8
|
||||
--- dmEv5Fz1iUJ3W93lFtkHgtknfQGQNkMqglJZ+3e1qM8
|
||||
<EFBFBD>U<EFBFBD><EFBFBD><EFBFBD>.<2E><>#C\<11><><EFBFBD> <09>V<EFBFBD><56>-<2D><><EFBFBD><EFBFBD><1F>tp<74>wnީ<><02><>n<EFBFBD><<3C>E<EFBFBD><45><EFBFBD>~<7E><>bX<62><02><><EFBFBD>_<EFBFBD><5F><07><><EFBFBD><EFBFBD>u<EFBFBD>l?<3F>),s<>Ec7<63><37><EFBFBD><EFBFBD>v<EFBFBD>;<3B>A<EFBFBD>U<EFBFBD>-<2D>I<EFBFBD>7Y<37>-<2D>3g[<5B>jh~<7E>/<2F>
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBWNEpt
|
||||
cGFNeVBBaDRqb3pLSEZGQW0wb3VmVnBoZCswUFkzbnBLUnJ0QTNrClRqVkk4RUVO
|
||||
d29KYjd5YUcwankvaTFmVHUxQVpDT2ZYWHRaY3JXTUtQMU0KLT4gKXBtQ3UsXi1n
|
||||
cmVhc2UgNnwxYCBXVyA/KCQmIHt9NAo3OTZVUHR2UXkvaEFwY0ZBdEJsaFpsbHJ0
|
||||
cklKcDVHcEdWMEdPSkpnN0FiRU43RW5hUWFMdjR3WFRRSFBLSGlmClM3cTNJWlNM
|
||||
TExkdHdXUHJISkNIaE1TTUxUc1NUWkV1a09HeFU3bVZwQXMKLS0tIGhOcXFTUElS
|
||||
azJJNnEreUhMWTJBaVZGSTJPRUFqQkVYS01KRENUVVpZSDgK8+8onFejroBo7MeO
|
||||
dW+so4lOsq4zJKn3f0cxmCFg1f0X8zt6h4Uc3A5Cvr1uU+6yw1FWmJ7xa3jJz3lO
|
||||
EEaKQJXYC+xIIKGcA7qILa0SFp4a/4OuYjcg27HrlPhg7u5wDhQrd0LdVEe1Xngp
|
||||
ZivX7P7HwIna3X8C+TL+K2v/AG2N/z86cdKfRvxyMKNbHhYw+CfHEnWgh8tJ++4h
|
||||
G9evNniuNqte6cQaRe7jODfPNW4FuY/Sb7barlJ/M9iAQdYAdyLAzU1LABeHeUfD
|
||||
wtHjxy9DUZ55Vg8bB8M2JJU9MkoRT4ewiVd9LeC1GWeVmKsm93wsmrov714i7U2j
|
||||
wHtDkjqEF2MmzuQc18sjNaAHiwz8j6o5xU2L/Q4+Q707yISWG7RGZYh389Cr1rnw
|
||||
siUq/Vunqw2wk13+J/4vu9nqt5mMktBaCtp+QiWIurjwB5LUAyChrSm+dg5lb0Mt
|
||||
UhSc0lq1+E3vxAXM2Hmk+vP86VD+6WJvAU82VFApF1s6zG2FU1/AcOVVf54nan/q
|
||||
f+rgSFfASHQCYSblUJHyEtwLNsWEmTGmOEn1buUKD/H0zatPQnc0rYpjlx2V0Sjd
|
||||
6yB5+wPrZ0AkN1pjcsPKOv8Kaog2DzqIjib+SaSTaRxWHQEb9uzvaReAcYI5HOpE
|
||||
gkC040HN33BItATbo4+hz70Im8Ni/VXD+g6yzM6Hj1hJL+PinTKeg5keQRFIZjMx
|
||||
grzievB2wVBBgLgN3qMdTFmpplaL7iL702JjXZUTTK9Izp+9wiCsV1fTa53FWDht
|
||||
ylFL5SWElqXjK+QBXxAe+Jk6VQov5HI21YDXL67S554ABeRok23wxrQ31TCI4xq9
|
||||
PQV7VtNRjyVud7S29m3OwpWOsgTZhn+JclHj2v4bNJzJkJnZRTmcvGPktzRI5+R4
|
||||
e5vxVhGnJDzI71txaHl8+xS1lu9VzCQUrxX6TXyTRV4KjIOz0g06JOBgmBRBvJca
|
||||
7MZbC65xpisl/gyLRbgkVga3t94dPV+dpZsn8eq6427IyRbKslJefatggR9//c6I
|
||||
5N5fl0fR3gJQMB+HRbipBH2YsdbdWJyb4Nn6STZxIfrqoG/xC6C1raF0xK7hUx6i
|
||||
4DUDSPohM8fOIswQPfE+FH3eygfzu/Ln5+ghsgHTEhgFvmgMvyxaAt6kHIzIUhMX
|
||||
M3dASr4VPDpIXuXsRWwYLEifhzxsuvwVxfwtsnCaR6XKijsYECWGDdYOWHdleeqx
|
||||
wDPhxEesfFVhKxhrKY9Ir8k9/FFBKQU/3GjW4+SMAg5Al1YEzxshP9vKuVcsei7W
|
||||
JDwAwotNXaCm6NBckiyZJE53ou6+gckPY7V9cOfnuH74Z9ywkFzB3HW3ZlonaGyM
|
||||
oGmLGcccavFtyhg5s/As4i6X8ARIpDiwe59Pn3GNXMctySqIrrr2ogUoXgrfFCie
|
||||
6GOTdeMW7GeOSdJUxCofghlspS/nq01Og77VI/beWYrIwLubSka6Zaltww9zgObk
|
||||
/FGEMgFkEpq7iyCvYSPA8F46pJKvnMP3S84AWCPmcTcHeg4lwGPvs6btexXBGdoz
|
||||
nkCyq7wdH5Nngm7jUbl88LtaLZPAQkuqXphBVTnrF9Ofbnb4iRZ2Op4xpx9rGyvx
|
||||
mO6UEhL6V1i2YZFNkNMg/W8aoMiUgBdqbkxaxblT9L0aNdlFU9+LbWYolURVEadd
|
||||
Qjv0Z1gMA+tsuBbVszwsMfneZ5+B9Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
||||
Binary file not shown.
11
secrets/openclaw_gateway_token.age
Normal file
11
secrets/openclaw_gateway_token.age
Normal file
@@ -0,0 +1,11 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBCWEpO
|
||||
cG9yNnFpcHFqTkNzTngxU1MxN0NYK0hrZFhUTjVORWFrK3JNd2tZCmtMTGpwQk1E
|
||||
WlUwL3N6SGRWblpnNEkrWkkyU2hQMkRIK0M3R0pOVEREV3MKLT4gY2osLWdyZWFz
|
||||
ZSBacSozVVQgUCAxRS1OQSAuKXxDPCoKbStWNW1BZjBZQzNDaTlDbU5EZkxsRWxM
|
||||
cXJ3dDU1RDNpOXRlV0tzdEp2NUo3S1lhRG5Md0RHTGlJdkFSYmt5YQo4R1hiQWRG
|
||||
V2VxekJKZwotLS0geG1XSi9VbkhXZHQzcEFVS3hKNzVueXFLa2xnZTc3Q2tJTVZ5
|
||||
eXJabWk5Ywp6bJCP3s0xxzjE+eTR+cv7ZUnkoliT/n7uIprq1BTn/LIRLkUTUqs3
|
||||
NiDwrXcoq4/QKd0Dt+8ap3vFAuusjGxRlnYMaRrZie2AGtTV8U7Q7durm9o2K+/4
|
||||
QzRQ/MtumIQm
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
@@ -1,8 +1,14 @@
|
||||
let
|
||||
keys = import ../lib/keys.nix;
|
||||
authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main ];
|
||||
authorizedKeys = [
|
||||
keys.users.gortium.main
|
||||
keys.hosts.lazyworkhorse.main
|
||||
keys.hosts.lazyworkhorse.bootstrap
|
||||
];
|
||||
in
|
||||
{
|
||||
"containers.env.age".publicKeys = authorizedKeys;
|
||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||
}
|
||||
|
||||
9
secrets/wireguard_preshared_key.age
Normal file
9
secrets/wireguard_preshared_key.age
Normal file
@@ -0,0 +1,9 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA3VG9Z
|
||||
MVFPVFc2VVJ3d0h0dmtBUnI3WHl2SzUxTkRZbjFCaGloWmV3dnd3ClcxdnVPeGd6
|
||||
SU4zR0Q0K1dtVjRRVHd0VW5XSFI0dVFpTjZnYk1DNjRxTVEKLT4gQzlgRy1ncmVh
|
||||
c2UKeUozOWgyUytSTVF0NjY2STBEb2VadwotLS0gblI3bmJCUWxxU3QrYTEyVFBI
|
||||
Snc4NC9rTkh0NnZYbUtxUE9hRWRkelpmMAq58fmH6cK13GeD7wGLxKmx10hmJeW4
|
||||
b7KqnCD1ZP7uG85s32xzVRwRG8RrG4xZo5nR9Mrtg1CoTSFfUGeFnf5xveN+Ej0X
|
||||
wDVB1LwC+Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
11
secrets/wireguard_private_key.age
Normal file
11
secrets/wireguard_private_key.age
Normal file
@@ -0,0 +1,11 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA5dzVG
|
||||
WUNvT3NlRmcrWS81bzJqSWlTekVYaDFFTE10SkI2dEgzaGpxcUI4Cmk5Y0FGYTRZ
|
||||
K0NGYzY3VUp4aS9ZZGRmWTgybDJFUURva2pZNmVOS3QxdEUKLT4gPnVRTCtldGMt
|
||||
Z3JlYXNlCk04OTJZeFRNeDI5aGpMVTk1ZTE0Y2FMMnFEMjlJalJpMHRlaTE4ZWIx
|
||||
d2lCRGQ5RHVjcktOMGJCb1VERlNWcTYKaSt0L1Z6dVJ0QWIyZkhsYzFEVjZSQWUr
|
||||
ZWpwVlo1TmhoUFJZdkEvR0gxNlVhcXF2ZTRnCi0tLSBLcmM2MThNVkdWclpHUXRr
|
||||
VTF6QVk2WUZlTXpZMVNLMlpBOFc3M1o5WjZzCs9xbPlIX+u5vRSQ/z9utu+I9S2c
|
||||
02DOsIb1kzxzb1OK91b8Kh4JucQSq3qkyEvRucsNn5QW8hIHDnRuND6EbPyN7p4S
|
||||
YB/F0dxSqgnq
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
93
users/ai-worker.nix
Normal file
93
users/ai-worker.nix
Normal file
@@ -0,0 +1,93 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
users.users.ai-worker = {
|
||||
isSystemUser = true;
|
||||
group = "ai-worker";
|
||||
home = "/home/ai-worker";
|
||||
createHome = true;
|
||||
extraGroups = [ "docker" ];
|
||||
shell = pkgs.bashInteractive;
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.ai-worker.main
|
||||
];
|
||||
# No password login - SSH key only
|
||||
hashedPassword = "!";
|
||||
};
|
||||
users.groups.ai-worker = {};
|
||||
|
||||
# Enable restricted AI worker SSH access for ollama benchmarking
|
||||
# SECURITY: ai-worker can only:
|
||||
# - SSH into host from Hermes container
|
||||
# - Run docker commands (docker exec ollama ...) via docker group
|
||||
# - Run specific security audit commands
|
||||
# - NO access to infra repo (no bind mount)
|
||||
# - NO sudo access (no nh, nixos-rebuild, nixpkgs-fmt, nix)
|
||||
# WORKFLOW: SSH from Hermes container, run docker benchmarks, return and save results to /opt/data/ai-optimizer/
|
||||
services.aiWorkerAccess = true;
|
||||
|
||||
# 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" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -1,17 +1,18 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
users.users.gortium = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.
|
||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
||||
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
btop
|
||||
nh
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.gortium.main
|
||||
];
|
||||
};
|
||||
programs.zsh.enable = true;
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "gortium" ];
|
||||
|
||||
Reference in New Issue
Block a user