vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update configuration for mennos-server and adjust related tasks
Some checks failed
Nix Format Check / check-format (push) Successful in 1m22s
Details
Python Lint Check / check-python (push) Successful in 25s
Details
Ansible Lint Check / check-ansible (push) Failing after 1h7m12s
Details

Browse Source
This commit is contained in:
Menno van Leeuwen
2025-10-16 14:53:32 +02:00
parent ba2faf114d
commit 2173e37c0a
16 changed files with 92 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/inventory.ini
View File

@@ -4,5 +4,5 @@ mennos-desktop ansible_connection=local
[servers] [servers]
mennos-vps ansible_connection=local mennos-vps ansible_connection=local
mennos-desktop ansible_connection=local mennos-server ansible_connection=local
mennos-rtlsdr-pc ansible_connection=local mennos-rtlsdr-pc ansible_connection=local

2
ansible/playbook.yml
View File

@@ -16,4 +16,4 @@
- name: Include server tasks - name: Include server tasks
ansible.builtin.import_tasks: tasks/servers/server.yml ansible.builtin.import_tasks: tasks/servers/server.yml
when: inventory_hostname in ['mennos-vps', 'mennos-desktop', 'mennos-rtlsdr-pc'] when: inventory_hostname in ['mennos-vps', 'mennos-server', 'mennos-rtlsdr-pc']

6
ansible/tasks/global/utils/smart-ssh/config.yaml
View File

@@ -13,6 +13,12 @@ smart_aliases:
desktop: desktop:
primary: "desktop-local" primary: "desktop-local"
fallback: "desktop" fallback: "desktop"
check_host: "192.168.1.250"
timeout: "2s"
server:
primary: "server-local"
fallback: "server"
check_host: "192.168.1.254" check_host: "192.168.1.254"
timeout: "2s" timeout: "2s"

2
ansible/tasks/servers/dynamic-dns.yml
View File

@@ -83,6 +83,6 @@
- Manual run: sudo /usr/local/bin/dynamic-dns-update.sh - Manual run: sudo /usr/local/bin/dynamic-dns-update.sh
- Domains: vleeuwen.me, mvl.sh, mennovanleeuwen.nl - Domains: vleeuwen.me, mvl.sh, mennovanleeuwen.nl
when: inventory_hostname == 'mennos-desktop' or inventory_hostname == 'mennos-vps' when: inventory_hostname == 'mennos-server' or inventory_hostname == 'mennos-vps'
tags: tags:
- dynamic-dns - dynamic-dns

2
ansible/tasks/servers/juicefs.yml
View File

@@ -70,7 +70,7 @@
- name: Include JuiceFS Redis tasks - name: Include JuiceFS Redis tasks
ansible.builtin.include_tasks: services/redis/redis.yml ansible.builtin.include_tasks: services/redis/redis.yml
when: inventory_hostname == 'mennos-desktop' when: inventory_hostname == 'mennos-server'
- name: Enable and start JuiceFS service - name: Enable and start JuiceFS service
ansible.builtin.systemd: ansible.builtin.systemd:

42
ansible/tasks/servers/server.yml
View File

@@ -78,84 +78,84 @@
- name: dashy - name: dashy
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: gitea - name: gitea
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: factorio - name: factorio
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: dozzle - name: dozzle
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: beszel - name: beszel
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: caddy - name: caddy
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: golink - name: golink
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: immich - name: immich
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: plex - name: plex
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: tautulli - name: tautulli
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: downloaders - name: downloaders
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: wireguard - name: wireguard
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: nextcloud - name: nextcloud
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: cloudreve - name: cloudreve
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: echoip - name: echoip
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: arr-stack - name: arr-stack
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: home-assistant - name: home-assistant
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: privatebin - name: privatebin
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: unifi-network-application - name: unifi-network-application
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server
- name: avorion - name: avorion
enabled: false enabled: false
hosts: hosts:
- mennos-desktop - mennos-server
- name: sathub - name: sathub
enabled: true enabled: true
hosts: hosts:
- mennos-desktop - mennos-server

2
ansible/tasks/servers/services/caddy/Caddyfile.j2
View File

@@ -28,7 +28,7 @@
} }
{% endif %} {% endif %}
{% if inventory_hostname == 'mennos-desktop' %} {% if inventory_hostname == 'mennos-server' %}
git.mvl.sh { git.mvl.sh {
import country_block import country_block
reverse_proxy gitea:3000 reverse_proxy gitea:3000

48
ansible/tasks/servers/services/dashy/conf.yml.j2
View File

@@ -5,34 +5,34 @@ sections:
- name: Selfhosted - name: Selfhosted
items: items:
- title: Plex - title: Plex
icon: http://mennos-desktop:4000/assets/plex.svg icon: http://mennos-server:4000/assets/plex.svg
url: https://plex.mvl.sh url: https://plex.mvl.sh
statusCheckUrl: https://plex.mvl.sh/identity statusCheckUrl: https://plex.mvl.sh/identity
statusCheck: true statusCheck: true
id: 0_1035_plex id: 0_1035_plex
- title: Tautulli - title: Tautulli
icon: http://mennos-desktop:4000/assets/tautulli.svg icon: http://mennos-server:4000/assets/tautulli.svg
url: https://tautulli.mvl.sh url: https://tautulli.mvl.sh
id: 1_1035_tautulli id: 1_1035_tautulli
statusCheck: true statusCheck: true
- title: Overseerr - title: Overseerr
icon: http://mennos-desktop:4000/assets/overseerr.svg icon: http://mennos-server:4000/assets/overseerr.svg
url: https://overseerr.mvl.sh url: https://overseerr.mvl.sh
id: 2_1035_overseerr id: 2_1035_overseerr
statusCheck: true statusCheck: true
- title: Immich - title: Immich
icon: http://mennos-desktop:4000/assets/immich.svg icon: http://mennos-server:4000/assets/immich.svg
url: https://photos.mvl.sh url: https://photos.mvl.sh
id: 3_1035_immich id: 3_1035_immich
statusCheck: true statusCheck: true
- title: Nextcloud - title: Nextcloud
icon: http://mennos-desktop:4000/assets/nextcloud.svg icon: http://mennos-server:4000/assets/nextcloud.svg
url: https://drive.mvl.sh url: https://drive.mvl.sh
id: 3_1035_nxtcld id: 3_1035_nxtcld
statusCheck: true statusCheck: true
- title: ComfyUI - title: ComfyUI
icon: http://mennos-desktop:8188/assets/favicon.ico icon: http://mennos-server:8188/assets/favicon.ico
url: http://mennos-desktop:8188 url: http://mennos-server:8188
statusCheckUrl: http://host.docker.internal:8188/api/system_stats statusCheckUrl: http://host.docker.internal:8188/api/system_stats
id: 3_1035_comfyui id: 3_1035_comfyui
statusCheck: true statusCheck: true
@@ -45,19 +45,19 @@ sections:
- name: Media Management - name: Media Management
items: items:
- title: Sonarr - title: Sonarr
icon: http://mennos-desktop:4000/assets/sonarr.svg icon: http://mennos-server:4000/assets/sonarr.svg
url: http://go/sonarr url: http://go/sonarr
id: 0_1533_sonarr id: 0_1533_sonarr
- title: Radarr - title: Radarr
icon: http://mennos-desktop:4000/assets/radarr.svg icon: http://mennos-server:4000/assets/radarr.svg
url: http://go/radarr url: http://go/radarr
id: 1_1533_radarr id: 1_1533_radarr
- title: Prowlarr - title: Prowlarr
icon: http://mennos-desktop:4000/assets/prowlarr.svg icon: http://mennos-server:4000/assets/prowlarr.svg
url: http://go/prowlarr url: http://go/prowlarr
id: 2_1533_prowlarr id: 2_1533_prowlarr
- title: Tdarr - title: Tdarr
icon: http://mennos-desktop:4000/assets/tdarr.png icon: http://mennos-server:4000/assets/tdarr.png
url: http://go/tdarr url: http://go/tdarr
id: 3_1533_tdarr id: 3_1533_tdarr
- name: Kagi - name: Kagi
@@ -77,7 +77,7 @@ sections:
- name: News - name: News
items: items:
- title: Nu.nl - title: Nu.nl
icon: http://mennos-desktop:4000/assets/nunl.svg icon: http://mennos-server:4000/assets/nunl.svg
url: https://www.nu.nl/ url: https://www.nu.nl/
id: 0_380_nu id: 0_380_nu
- title: Tweakers.net - title: Tweakers.net
@@ -91,7 +91,7 @@ sections:
- name: Downloaders - name: Downloaders
items: items:
- title: qBittorrent - title: qBittorrent
icon: http://mennos-desktop:4000/assets/qbittorrent.svg icon: http://mennos-server:4000/assets/qbittorrent.svg
url: http://go/qbit url: http://go/qbit
id: 0_1154_qbittorrent id: 0_1154_qbittorrent
tags: tags:
@@ -99,7 +99,7 @@ sections:
- torrent - torrent
- yarr - yarr
- title: Sabnzbd - title: Sabnzbd
icon: http://mennos-desktop:4000/assets/sabnzbd.svg icon: http://mennos-server:4000/assets/sabnzbd.svg
url: http://go/sabnzbd url: http://go/sabnzbd
id: 1_1154_sabnzbd id: 1_1154_sabnzbd
tags: tags:
@@ -109,7 +109,7 @@ sections:
- name: Git - name: Git
items: items:
- title: GitHub - title: GitHub
icon: http://mennos-desktop:4000/assets/github.svg icon: http://mennos-server:4000/assets/github.svg
url: https://github.com/vleeuwenmenno url: https://github.com/vleeuwenmenno
id: 0_292_github id: 0_292_github
tags: tags:
@@ -117,7 +117,7 @@ sections:
- git - git
- hub - hub
- title: Gitea - title: Gitea
icon: http://mennos-desktop:4000/assets/gitea.svg icon: http://mennos-server:4000/assets/gitea.svg
url: http://git.mvl.sh/vleeuwenmenno url: http://git.mvl.sh/vleeuwenmenno
id: 1_292_gitea id: 1_292_gitea
tags: tags:
@@ -127,14 +127,14 @@ sections:
- name: Server Monitoring - name: Server Monitoring
items: items:
- title: Beszel - title: Beszel
icon: http://mennos-desktop:4000/assets/beszel.svg icon: http://mennos-server:4000/assets/beszel.svg
url: http://go/beszel url: http://go/beszel
tags: tags:
- monitoring - monitoring
- logs - logs
id: 0_1725_beszel id: 0_1725_beszel
- title: Dozzle - title: Dozzle
icon: http://mennos-desktop:4000/assets/dozzle.svg icon: http://mennos-server:4000/assets/dozzle.svg
url: http://go/dozzle url: http://go/dozzle
id: 1_1725_dozzle id: 1_1725_dozzle
tags: tags:
@@ -150,19 +150,19 @@ sections:
- name: Tools - name: Tools
items: items:
- title: Home Assistant - title: Home Assistant
icon: http://mennos-desktop:4000/assets/home-assistant.svg icon: http://mennos-server:4000/assets/home-assistant.svg
url: http://go/homeassistant url: http://go/homeassistant
id: 0_529_homeassistant id: 0_529_homeassistant
- title: Tailscale - title: Tailscale
icon: http://mennos-desktop:4000/assets/tailscale.svg icon: http://mennos-server:4000/assets/tailscale.svg
url: http://go/tailscale url: http://go/tailscale
id: 1_529_tailscale id: 1_529_tailscale
- title: GliNet KVM - title: GliNet KVM
icon: http://mennos-desktop:4000/assets/glinet.svg icon: http://mennos-server:4000/assets/glinet.svg
url: http://go/glkvm url: http://go/glkvm
id: 2_529_glinetkvm id: 2_529_glinetkvm
- title: Unifi Network Controller - title: Unifi Network Controller
icon: http://mennos-desktop:4000/assets/unifi.svg icon: http://mennos-server:4000/assets/unifi.svg
url: http://go/unifi url: http://go/unifi
id: 3_529_unifinetworkcontroller id: 3_529_unifinetworkcontroller
- title: Dashboard Icons - title: Dashboard Icons
@@ -236,7 +236,7 @@ sections:
- discount - discount
- work - work
- title: Proxmox - title: Proxmox
icon: http://mennos-desktop:4000/assets/proxmox.svg icon: http://mennos-server:4000/assets/proxmox.svg
url: https://www.transip.nl/cp/vps/prm/350680/ url: https://www.transip.nl/cp/vps/prm/350680/
id: 5_1429_proxmox id: 5_1429_proxmox
tags: tags:
@@ -252,7 +252,7 @@ sections:
- discount - discount
- work - work
- title: Kibana - title: Kibana
icon: http://mennos-desktop:4000/assets/kibana.svg icon: http://mennos-server:4000/assets/kibana.svg
url: http://go/kibana url: http://go/kibana
id: 7_1429_kibana id: 7_1429_kibana
tags: tags:

6
ansible/tasks/servers/services/sathub/docker-compose.yml.j2
View File

@@ -66,7 +66,7 @@ services:
- sathub - sathub
- caddy_network - caddy_network
depends_on: depends_on:
migration: migrate:
condition: service_completed_successfully condition: service_completed_successfully
worker: worker:
@@ -101,7 +101,7 @@ services:
networks: networks:
- sathub - sathub
depends_on: depends_on:
migration: migrate:
condition: service_completed_successfully condition: service_completed_successfully
postgres: postgres:
@@ -154,7 +154,7 @@ services:
- WATCHTOWER_INCLUDE_STOPPED=false - WATCHTOWER_INCLUDE_STOPPED=false
- REPO_USER=${REPO_USER} - REPO_USER=${REPO_USER}
- REPO_PASS=${REPO_PASS} - REPO_PASS=${REPO_PASS}
command: --interval 30 --cleanup --include-stopped=false sathub-backend sathub-worker sathub-frontend sathub-migrate command: --interval 30 --cleanup --include-stopped=false sathub-backend sathub-worker sathub-frontend
networks: networks:
- sathub - sathub

2
ansible/templates/juicefs.service.j2
View File

@@ -5,7 +5,7 @@ Before=docker.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-desktop:6379/0 /mnt/object_storage \ ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-server:6379/0 /mnt/object_storage \
--cache-dir=/var/jfsCache \ --cache-dir=/var/jfsCache \
--buffer-size=4096 \ --buffer-size=4096 \
--prefetch=16 \ --prefetch=16 \

11
config/autostart/Nextcloud.desktop Normal file
View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Name=Nextcloud
GenericName=File Synchronizer
Exec="/usr/bin/nextcloud" --background
Terminal=false
Icon=Nextcloud
Categories=Network
Type=Application
StartupNotify=false
X-GNOME-Autostart-enabled=true
X-GNOME-Autostart-Delay=10

8
config/autostart/equibop.desktop Normal file
View File

@@ -0,0 +1,8 @@
[Desktop Entry]
Type=Application
Name=Equibop
Comment=Equibop autostart script
Exec="/opt/Equibop/equibop"
StartupNotify=false
Terminal=false
Icon=vesktop

2
config/git.nix
View File

@@ -23,7 +23,7 @@
}; };
core = { core = {
editor = "zed"; editor = "micro";
autocrlf = false; autocrlf = false;
filemode = true; filemode = true;
ignorecase = false; ignorecase = false;

8
config/nextcloud.cfg Normal file
View File

@@ -0,0 +1,8 @@
[General]
clientVersion=3.16.0-1 (Debian built)
isVfsEnabled=false
launchOnSystemStartup=true
promptDeleteAllFiles=false
[Accounts]
version=13

6
flake.lock generated
View File

@@ -41,11 +41,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759735786, "lastModified": 1759994382,
"narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@@ -42,6 +42,7 @@
{ {
"mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true; "mennos-vps" = mkHomeConfig "aarch64-linux" "mennos-vps" true;
"mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false; "mennos-desktop" = mkHomeConfig "x86_64-linux" "mennos-desktop" false;
"mennos-server" = mkHomeConfig "x86_64-linux" "mennos-server" true;
"mennos-rtlsdr-pc" = mkHomeConfig "x86_64-linux" "mennos-rtlsdr-pc" true; "mennos-rtlsdr-pc" = mkHomeConfig "x86_64-linux" "mennos-rtlsdr-pc" true;
"mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false; "mennos-laptop" = mkHomeConfig "x86_64-linux" "mennos-laptop" false;
}; };