From a704133a0b181abb0c3ceb4968e1d00ddd1a860f Mon Sep 17 00:00:00 2001 From: Lino Silva Date: Wed, 1 Apr 2026 23:43:17 +0100 Subject: [PATCH] chore: Formatting --- .prettierignore | 27 +++++++++++++++++ .prettierrc | 29 +++++++++++++++++++ .vscode/settings.json | 16 ++++++++++ ansible/inventories/group_vars/all/main.yml | 2 +- ansible/inventories/production.yml | 1 - ansible/playbooks/provision_vms.yml | 1 - ansible/roles/fail2ban/tasks/main.yml | 10 +++---- ansible/roles/keepalived/tasks/main.yml | 2 +- ansible/roles/pocketid/tasks/main.yml | 6 ++-- ansible/roles/tinyauth/tasks/main.yml | 4 +-- ansible/roles/traefik/tasks/main.yml | 14 ++++----- .../traefik/templates/docker-compose.yml.j2 | 2 +- ansible/roles/vm_apps/tasks/main.yml | 2 +- ansible/roles/vm_infra/tasks/main.yml | 2 +- ansible/roles/vm_plex/tasks/main.yml | 2 +- ansible/roles/website/tasks/main.yml | 8 ++--- 16 files changed, 99 insertions(+), 29 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 .vscode/settings.json diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..0e455b6 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,27 @@ +# Dependencies +node_modules +**/node_modules + +# Build outputs +build +dist +*.min.js +*.min.css + +# Package manager +package-lock.json +yarn.lock +pnpm-lock.yaml + +# Vault files (encrypted) +**/vault.yml + +# Jinja templates (complex YAML+Jinja2 syntax) +**/*.j2 +**/*.jinja +**/*.jinja2 + +# Generated files +*.log +coverage +.cache diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..5890471 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,29 @@ +{ + "semi": true, + "trailingComma": "es5", + "singleQuote": true, + "printWidth": 100, + "tabWidth": 2, + "useTabs": false, + "endOfLine": "lf", + "overrides": [ + { + "files": ["*.yml", "*.yaml"], + "options": { + "tabWidth": 2, + "singleQuote": false, + "printWidth": 120 + } + }, + { + "files": ["*.ts", "*.tsx"], + "options": { + "parser": "typescript", + "printWidth": 100, + "semi": true, + "singleQuote": true, + "trailingComma": "es5" + } + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e96ca23 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,16 @@ +{ + "editor.formatOnSave": true, + "editor.defaultFormatter": "esbenp.prettier-vscode", + "[yaml]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true + } +} diff --git a/ansible/inventories/group_vars/all/main.yml b/ansible/inventories/group_vars/all/main.yml index 38847bb..b5edce4 100644 --- a/ansible/inventories/group_vars/all/main.yml +++ b/ansible/inventories/group_vars/all/main.yml @@ -75,7 +75,7 @@ auto_configure_traefik: auth_required: false # media - plex: + plex: subdomain: "plex" host: "10.0.2.10" port: 32400 diff --git a/ansible/inventories/production.yml b/ansible/inventories/production.yml index e539bbe..cb1aaaf 100644 --- a/ansible/inventories/production.yml +++ b/ansible/inventories/production.yml @@ -28,4 +28,3 @@ all: hosts: edge-2: ansible_host: 10.0.4.2 - diff --git a/ansible/playbooks/provision_vms.yml b/ansible/playbooks/provision_vms.yml index 33456ce..f292142 100644 --- a/ansible/playbooks/provision_vms.yml +++ b/ansible/playbooks/provision_vms.yml @@ -20,7 +20,6 @@ - tinyauth - pocketid - website - # - hosts: all # become: yes # roles: diff --git a/ansible/roles/fail2ban/tasks/main.yml b/ansible/roles/fail2ban/tasks/main.yml index 180abd5..1a36a54 100644 --- a/ansible/roles/fail2ban/tasks/main.yml +++ b/ansible/roles/fail2ban/tasks/main.yml @@ -9,19 +9,19 @@ file: path: /etc/fail2ban/filter.d state: directory - mode: '0755' + mode: "0755" - name: Ensure fail2ban jail directory exists file: path: /etc/fail2ban/jail.d state: directory - mode: '0755' + mode: "0755" - name: Ensure traefik log directory exists file: path: /var/log/traefik state: directory - mode: '0755' + mode: "0755" owner: root group: root @@ -29,7 +29,7 @@ template: src: "{{ item }}" dest: "/etc/fail2ban/filter.d/{{ item | basename | regex_replace('\\.j2$', '') }}" - mode: '0644' + mode: "0644" loop: - traefik-auth.conf.j2 - traefik-404.conf.j2 @@ -41,7 +41,7 @@ template: src: jail.local.j2 dest: /etc/fail2ban/jail.d/traefik.local - mode: '0644' + mode: "0644" notify: Restart fail2ban - name: Ensure fail2ban is enabled and started diff --git a/ansible/roles/keepalived/tasks/main.yml b/ansible/roles/keepalived/tasks/main.yml index 618f503..705f016 100644 --- a/ansible/roles/keepalived/tasks/main.yml +++ b/ansible/roles/keepalived/tasks/main.yml @@ -9,7 +9,7 @@ template: src: keepalived.conf.j2 dest: /etc/keepalived/keepalived.conf - mode: '0644' + mode: "0644" notify: restart keepalived - name: Enable and start keepalived diff --git a/ansible/roles/pocketid/tasks/main.yml b/ansible/roles/pocketid/tasks/main.yml index b960f85..f946f9c 100644 --- a/ansible/roles/pocketid/tasks/main.yml +++ b/ansible/roles/pocketid/tasks/main.yml @@ -42,7 +42,7 @@ file: path: "{{ app_data_disks.pocketid.mount_point }}" state: directory - mode: '0755' + mode: "0755" - name: Mount data disk mount: @@ -56,13 +56,13 @@ file: path: /opt/pocketid state: directory - mode: '0755' + mode: "0755" - name: Create docker-compose file for Pocket ID template: src: docker-compose.yml.j2 dest: /opt/pocketid/docker-compose.yml - mode: '0644' + mode: "0644" - name: Start Pocket ID shell: cd /opt/pocketid && docker compose down && docker compose up -d args: diff --git a/ansible/roles/tinyauth/tasks/main.yml b/ansible/roles/tinyauth/tasks/main.yml index 3418312..91f1d18 100644 --- a/ansible/roles/tinyauth/tasks/main.yml +++ b/ansible/roles/tinyauth/tasks/main.yml @@ -3,13 +3,13 @@ file: path: /opt/tinyauth state: directory - mode: '0755' + mode: "0755" - name: Create docker-compose file for tinyauth template: src: docker-compose.yml.j2 dest: /opt/tinyauth/docker-compose.yml - mode: '0644' + mode: "0644" - name: Start tinyauth shell: cd /opt/tinyauth && docker compose down && docker compose up -d diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml index fbd91b2..7108d8d 100644 --- a/ansible/roles/traefik/tasks/main.yml +++ b/ansible/roles/traefik/tasks/main.yml @@ -3,19 +3,19 @@ file: path: /opt/traefik state: directory - mode: '0755' + mode: "0755" - name: Create traefik data directory file: path: /opt/traefik/data state: directory - mode: '0755' + mode: "0755" - name: Create traefik dynamic config directory file: path: /opt/traefik/data/dynamic state: directory - mode: '0755' + mode: "0755" - name: Create proxy network docker_network: @@ -25,25 +25,25 @@ file: path: /opt/traefik/data/acme.json state: touch - mode: '0600' + mode: "0600" - name: Create traefik config file template: src: traefik.yml.j2 dest: /opt/traefik/data/traefik.yml - mode: '0644' + mode: "0644" - name: Create remote services configuration template: src: remote-services.yml.j2 dest: /opt/traefik/data/dynamic/remote-services.yml - mode: '0644' + mode: "0644" - name: Create docker-compose file template: src: docker-compose.yml.j2 dest: /opt/traefik/docker-compose.yml - mode: '0644' + mode: "0644" - name: Start Traefik shell: cd /opt/traefik && docker compose down && docker compose up -d diff --git a/ansible/roles/traefik/templates/docker-compose.yml.j2 b/ansible/roles/traefik/templates/docker-compose.yml.j2 index 3c1f9c9..b9d4464 100644 --- a/ansible/roles/traefik/templates/docker-compose.yml.j2 +++ b/ansible/roles/traefik/templates/docker-compose.yml.j2 @@ -9,7 +9,7 @@ services: - proxy ports: - "80:80" - - "443:443" + - "443:443" - "8080:8080" environment: - CF_DNS_API_TOKEN={{ cloudflare_api_token | default('') }} diff --git a/ansible/roles/vm_apps/tasks/main.yml b/ansible/roles/vm_apps/tasks/main.yml index 34f2e9c..e06f0fd 100644 --- a/ansible/roles/vm_apps/tasks/main.yml +++ b/ansible/roles/vm_apps/tasks/main.yml @@ -3,7 +3,7 @@ ansible.builtin.file: path: "/data/{{ item }}" state: directory - mode: '0755' + mode: "0755" loop: - paperless - nextcloud diff --git a/ansible/roles/vm_infra/tasks/main.yml b/ansible/roles/vm_infra/tasks/main.yml index ee12ffc..284a0fb 100644 --- a/ansible/roles/vm_infra/tasks/main.yml +++ b/ansible/roles/vm_infra/tasks/main.yml @@ -3,7 +3,7 @@ ansible.builtin.file: path: "/data/{{ item }}" state: directory - mode: '0755' + mode: "0755" loop: - vaultwarden - pi-hole diff --git a/ansible/roles/vm_plex/tasks/main.yml b/ansible/roles/vm_plex/tasks/main.yml index db68ea9..35fc76d 100644 --- a/ansible/roles/vm_plex/tasks/main.yml +++ b/ansible/roles/vm_plex/tasks/main.yml @@ -7,4 +7,4 @@ ansible.builtin.file: path: /data/media state: directory - mode: '0755' + mode: "0755" diff --git a/ansible/roles/website/tasks/main.yml b/ansible/roles/website/tasks/main.yml index 395aa0e..e1379d7 100644 --- a/ansible/roles/website/tasks/main.yml +++ b/ansible/roles/website/tasks/main.yml @@ -9,13 +9,13 @@ file: path: /opt/website state: directory - mode: '0755' + mode: "0755" - name: Ensure website html directory exists file: path: /opt/website/html state: directory - mode: '0755' + mode: "0755" - name: Copy website build files synchronize: @@ -30,13 +30,13 @@ template: src: nginx.conf.j2 dest: /opt/website/nginx.conf - mode: '0644' + mode: "0644" - name: Deploy website docker-compose template: src: docker-compose.yml.j2 dest: /opt/website/docker-compose.yml - mode: '0644' + mode: "0644" - name: Start website container shell: cd /opt/website && docker compose down && docker compose up -d