diff --git a/ansible/tasks/global/utils/smart-ssh/config.yaml b/ansible/tasks/global/utils/smart-ssh/config.yaml index 16635c7..f13e065 100644 --- a/ansible/tasks/global/utils/smart-ssh/config.yaml +++ b/ansible/tasks/global/utils/smart-ssh/config.yaml @@ -28,6 +28,12 @@ smart_aliases: check_host: "192.168.1.253" timeout: "2s" + rtlsdr: + primary: "rtlsdr-local" + fallback: "rtlsdr" + check_host: "192.168.1.252" + timeout: "2s" + # Background SSH Tunnel Definitions tunnels: # Example: Desktop database tunnel diff --git a/ansible/tasks/servers/server.yml b/ansible/tasks/servers/server.yml index b21dc58..ba7090f 100644 --- a/ansible/tasks/servers/server.yml +++ b/ansible/tasks/servers/server.yml @@ -5,15 +5,13 @@ ansible.builtin.package: name: openssh state: present - when: ansible_pkg_mgr == 'pacman' and 'microsoft-standard-WSL2' not in ansible_kernel - become: true + when: ansible_pkg_mgr == 'pacman' - name: Ensure openssh-server is installed on non-Arch systems ansible.builtin.package: name: openssh-server state: present - when: ansible_pkg_mgr != 'pacman' and 'microsoft-standard-WSL2' not in ansible_kernel - become: true + when: ansible_pkg_mgr != 'pacman' - name: Ensure Borg is installed on Arch-based systems ansible.builtin.package: @@ -161,3 +159,7 @@ enabled: true hosts: - mennos-server + - name: necesse + enabled: true + hosts: + - mennos-server diff --git a/ansible/tasks/servers/services/necesse/docker-compose.yml.j2 b/ansible/tasks/servers/services/necesse/docker-compose.yml.j2 new file mode 100644 index 0000000..9009e90 --- /dev/null +++ b/ansible/tasks/servers/services/necesse/docker-compose.yml.j2 @@ -0,0 +1,15 @@ +services: + necesse: + image: brammys/necesse-server + container_name: necesse + restart: unless-stopped + ports: + - "14159:14159/udp" + environment: + - MOTD=StarDebris' Server! + - PASSWORD=2142 + - SLOTS=4 + - PAUSE=1 + volumes: + - {{ necesse_data_dir }}/saves:/necesse/saves + - {{ necesse_data_dir }}/logs:/necesse/logs diff --git a/ansible/tasks/servers/services/necesse/necesse.yml b/ansible/tasks/servers/services/necesse/necesse.yml new file mode 100644 index 0000000..d221d5a --- /dev/null +++ b/ansible/tasks/servers/services/necesse/necesse.yml @@ -0,0 +1,41 @@ +--- +- name: Deploy Necesse service + block: + - name: Set Necesse directories + ansible.builtin.set_fact: + necesse_service_dir: "{{ ansible_env.HOME }}/.services/necesse" + necesse_data_dir: "/mnt/services/necesse" + + - name: Create Necesse service directory + ansible.builtin.file: + path: "{{ necesse_service_dir }}" + state: directory + mode: "0755" + + - name: Create Necesse data directories + ansible.builtin.file: + path: "{{ item }}" + state: directory + mode: "0755" + loop: + - "{{ necesse_data_dir }}" + - "{{ necesse_data_dir }}/saves" + - "{{ necesse_data_dir }}/logs" + + - name: Deploy Necesse docker-compose.yml + ansible.builtin.template: + src: docker-compose.yml.j2 + dest: "{{ necesse_service_dir }}/docker-compose.yml" + mode: "0644" + register: necesse_compose + + - name: Stop Necesse service + ansible.builtin.command: docker compose -f "{{ necesse_service_dir }}/docker-compose.yml" down --remove-orphans + when: necesse_compose.changed + + - name: Start Necesse service + ansible.builtin.command: docker compose -f "{{ necesse_service_dir }}/docker-compose.yml" up -d + when: necesse_compose.changed + tags: + - services + - necesse diff --git a/ansible/tasks/servers/services/redis/redis.yml b/ansible/tasks/servers/services/redis/redis.yml index 22b0f29..3f043f3 100644 --- a/ansible/tasks/servers/services/redis/redis.yml +++ b/ansible/tasks/servers/services/redis/redis.yml @@ -34,6 +34,7 @@ register: juicefs_stop changed_when: juicefs_stop.changed when: redis_compose.changed and juicefs_service_stat.stat.exists + become: true - name: List containers that are running ansible.builtin.command: docker ps -q @@ -68,6 +69,7 @@ register: juicefs_start changed_when: juicefs_start.changed when: juicefs_service_stat.stat.exists + become: true - name: Restart containers that were stopped ansible.builtin.command: docker start {{ item }} diff --git a/ansible/tasks/servers/services/sathub/.env.j2 b/ansible/tasks/servers/services/sathub/.env.j2 index e4ac420..dc73eb6 100644 --- a/ansible/tasks/servers/services/sathub/.env.j2 +++ b/ansible/tasks/servers/services/sathub/.env.j2 @@ -45,3 +45,9 @@ CORS_ALLOWED_ORIGINS=https://sathub.de,https://sathub.nl,https://api.sathub.de # Frontend configuration (optional - defaults are provided) VITE_API_BASE_URL=https://api.sathub.de VITE_ALLOWED_HOSTS=sathub.de,sathub.nl + +# Discord related messsaging +DISCORD_CLIENT_ID={{ lookup('community.general.onepassword', 'sathub', vault='Dotfiles', field='DISCORD_CLIENT_ID') }} +DISCORD_CLIENT_SECRET={{ lookup('community.general.onepassword', 'sathub', vault='Dotfiles', field='DISCORD_CLIENT_SECRET') }} +DISCORD_REDIRECT_URI={{ lookup('community.general.onepassword', 'sathub', vault='Dotfiles', field='DISCORD_REDIRECT_URL') }} +DISCORD_WEBHOOK_URL={{ lookup('community.general.onepassword', 'sathub', vault='Dotfiles', field='DISCORD_WEBHOOK_URL') }} diff --git a/ansible/tasks/servers/services/sathub/docker-compose.yml.j2 b/ansible/tasks/servers/services/sathub/docker-compose.yml.j2 index 86191dd..69c3def 100644 --- a/ansible/tasks/servers/services/sathub/docker-compose.yml.j2 +++ b/ansible/tasks/servers/services/sathub/docker-compose.yml.j2 @@ -62,6 +62,12 @@ services: - MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} - MINIO_SECRET_KEY=${MINIO_SECRET_KEY} - MINIO_EXTERNAL_URL=https://obj.sathub.de + + # Discord settings + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + - DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET} + - DISCORD_REDIRECT_URI=${DISCORD_REDIRECT_URI} + - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL} networks: - sathub - caddy_network @@ -98,6 +104,12 @@ services: - MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} - MINIO_SECRET_KEY=${MINIO_SECRET_KEY} - MINIO_EXTERNAL_URL=https://obj.sathub.de + + # Discord settings + - DISCORD_CLIENT_ID=${DISCORD_CLIENT_ID} + - DISCORD_CLIENT_SECRET=${DISCORD_CLIENT_SECRET} + - DISCORD_REDIRECT_URI=${DISCORD_REDIRECT_URI} + - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL} networks: - sathub depends_on: @@ -113,7 +125,7 @@ services: - POSTGRES_PASSWORD=${DB_PASSWORD} - POSTGRES_DB=${DB_NAME:-sathub} volumes: - - postgres_data:/var/lib/postgresql/data + - {{ sathub_data_dir }}/postgres_data:/var/lib/postgresql/data networks: - sathub @@ -136,7 +148,7 @@ services: - MINIO_ROOT_USER=${MINIO_ROOT_USER} - MINIO_ROOT_PASSWORD=${MINIO_ROOT_PASSWORD} volumes: - - minio_data:/data + - {{ sathub_data_dir }}/minio_data:/data command: server /data --console-address :9001 networks: - sathub @@ -158,12 +170,6 @@ services: networks: - sathub -volumes: - minio_data: - driver: local - postgres_data: - driver: local - networks: sathub: driver: bridge diff --git a/ansible/templates/zed.jsonc b/ansible/templates/zed.jsonc index 6420e0b..3bb2fed 100644 --- a/ansible/templates/zed.jsonc +++ b/ansible/templates/zed.jsonc @@ -10,6 +10,7 @@ // ############################################# // ## Theming ## // ############################################# + "formatter": "prettier", "context_servers": { "mcp-server-context7": { "source": "extension", @@ -96,7 +97,7 @@ "hide_mouse": "on_typing", "on_last_window_closed": "quit_app", "ensure_final_newline_on_save": true, - "format_on_save": "prettier", + "format_on_save": "on", "tab_size": 2, "inlay_hints": { "enabled": true, diff --git a/config/autostart/equibop.desktop b/config/autostart/equibop.desktop old mode 100644 new mode 100755