Directory structure overhaul

2025-08-24 10:38:16 -04:00
parent d4f58c985f
commit a4b146ad07
2081 changed files with 663 additions and 45416 deletions
@@ -0,0 +1,293 @@
+name: Home Assistant & Miscellaneous Deployment
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore:
+      - 'main'
+    paths:
+      - '**/docker-compose.yml'
+env:
+  HC_VAULT_VERSION: '1.20.0'
+  TEA_VERSION: '0.10.1'
+jobs:
+  check-and-create-pr:
+    if: github.ref != 'refs/heads/main'
+    name: Check and Create PR
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Cache tea CLI
+        id: cache-tea
+        uses: actions/cache@v4
+        with:
+          path: /opt/hostedtoolcache/tea/${{ env.TEA_VERSION }}/x64
+          key: tea-${{ runner.os }}-${{ env.TEA_VERSION }}
+      - name: Install tea
+        uses: supplypike/setup-bin@v4
+        with:
+          uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64
+          name: tea
+          version: ${{ env.TEA_VERSION }}
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: PR Check'
+          notification_message: 'Checking for existing PR... 🔍'
+      - name: Check if open PR exists
+        id: check-opened-pr-step
+        continue-on-error: true
+        run: |
+          tea login add --name gitea-rinoa --url "${{ secrets.RIKKU_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep '\[HA\].*${{ github.ref_name }}' | tail -1 | wc -l)
+          echo "exists=$pr_exists" >> $GITHUB_OUTPUT
+      - name: Create PR
+        if: ${{ steps.check-opened-pr-step.outputs.exists == '0' }}
+        run: |
+          tea login default gitea-rinoa
+          pr_index_old=$(tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head --output csv | sed -e 's|"||g' | egrep '^[0-9]' | head -1 | awk -F"," '{print $1}')
+          pr_index_new=$(expr ${pr_index_old} + 1)
+          tea pr c -r ${{ github.repository }} -t "[HA] Automated PR for ${{ github.ref_name }} - #${pr_index_new}" -d "Automatically created PR for branch: ${{ github.ref_name }}" -a ${{ github.actor }} -L "Docker Compose"
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: PR Check'
+          notification_message: 'PR Created 🎟️'
+  home-assistant-config-check:
+    name: Home Assistant Configuration Check
+    needs: [docker-compose-dry-run]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: Home Assistant Config Check'
+          notification_message: 'Beginning HA config check...'
+      - name: Run Home Assistant Configuration Check
+        uses: frenck/action-home-assistant@v1
+        with:
+          path: "app-configs/homeassistant/"
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: Home Assistant Config Check'
+          notification_message: 'Config check completed'
+  generate-service-list:
+    name: Generate list of added/modified/deleted services
+    runs-on: ubuntu-latest
+    needs: [check-and-create-pr]
+    outputs:
+      svc_deploy_list: ${{ steps.detect_services.outputs.docker_svc_list }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Fetch base branch
+        run: |
+          git fetch origin ${{ github.event.pull_request.base.ref }}
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: Services TBD'
+          notification_message: 'Generating list of services to deploy...'
+      - name: Save both versions of docker-compose.yml
+        run: |
+          git show origin/main:docker-compose.yml > docker-compose-main.yml || touch docker-compose-main.yml
+          cp docker-compose.yml docker-compose-head.yml
+      - name: Detect added, deleted, and modified services
+        id: detect_services
+        run: |
+          echo "Getting services from main and ${{ github.ref_name }}"
+          yq '.services | keys | .[]' docker-compose-main.yml | sort > services_main.txt
+          yq '.services | keys | .[]' docker-compose-head.yml | sort > services_head.txt
+
+          echo "Creating list of modified services..."
+          touch service_changes.txt
+
+          comm -13 services_main.txt services_head.txt | while read service; do
+            echo "$service: added" >> service_changes.txt
+          done
+
+          comm -12 services_main.txt services_head.txt | while read service; do
+            yq ".services[\"$service\"]" docker-compose-main.yml > tmp_main.yml
+            yq ".services[\"$service\"]" docker-compose-head.yml > tmp_head.yml
+            if ! diff -q tmp_main.yml tmp_head.yml > /dev/null; then
+              echo "$service: modified" >> service_changes.txt
+            fi
+          done
+
+          echo "Detected service changes:"
+          cat service_changes.txt
+
+          mod_svcs=$(cut -d':' -f1 service_changes.txt | sort | uniq)
+          echo "docker_svc_list<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$mod_svcs" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+      - name: List of Services for (Re)Deployment
+        run: |
+          echo -e "${{ steps.detect_services.outputs.docker_svc_list }}"
+  docker-compose-dry-run:
+    name: Docker Compose Dry Run
+    needs: [generate-service-list]
+    runs-on: ubuntu-latest
+    env:
+      VAULT_ADDR: ${{ secrets.RIKKU_VAULT_ADDR }}
+      VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
+      VAULT_NAMESPACE: ""
+      RIKKU_REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
+      DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to Gitea Container Registry
+        run: |
+          docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf
+      - name: Cache Vault install
+        id: cache-vault
+        uses: actions/cache@v4
+        with:
+          path: /opt/hostedtoolcache/vault/${{ env.HC_VAULT_VERSION }}/x64
+          key: vault-${{ runner.os }}-${{ env.HC_VAULT_VERSION }}
+      - name: Install Vault (only if not cached)
+        if: steps.cache-vault.outputs.cache-hit != 'true'
+        uses: cpanato/vault-installer@main
+        with:
+          version: ${{ env.HC_VAULT_VERSION }}
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: Docker Compose Dry Run @ Rinoa'
+          notification_message: 'Starting Docker Compose dry run...'
+      - name: Generate .env file for Docker Compose
+        run: |
+          vault kv get -format=json rikku-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
+          echo ${DOCKER_SVC_LIST}
+      - name: Docker Compose Dry Run
+        uses: astappiev/docker-compose-remote-action@master
+        with:
+          ssh_user: pi
+          ssh_host: 192.168.1.252
+          ssh_private_key: ${RIKKU_SSH_PRIVATE_KEY}
+          ssh_host_public_key: ${RIKKU_SSH_PUBLIC_KEY}
+          docker_args: -d --remove-orphans --build ${DOCKER_SVC_LIST}
+      - name: Gotify Notification
+        uses: eikendev/gotify-action@master
+        with:
+          gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+          gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+          notification_title: 'GITEA: Docker Compose Dry Run @ Rinoa'
+          notification_message: 'Docker Compose dry run completed successfully.'
+  # pr-merge:
+  #   name: PR Merge
+  #   needs: [regenerate-readme-modified-services]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #     - name: Cache tea CLI
+  #       id: cache-tea
+  #       uses: actions/cache@v4
+  #       with:
+  #         path: /opt/hostedtoolcache/tea/${{ env.TEA_VERSION }}/x64
+  #         key: tea-${{ runner.os }}-${{ env.TEA_VERSION }}
+  #     - name: Install tea
+  #       uses: supplypike/setup-bin@v4
+  #       with:
+  #         uri: https://gitea.com/gitea/tea/releases/download/v${{ env.TEA_VERSION }}/tea-${{ env.TEA_VERSION }}-linux-amd64
+  #         name: tea
+  #         version: ${{ env.TEA_VERSION }}
+  #     - name: PR Merge
+  #       id: pr_merge
+  #       run: |
+  #         tea login add --name gitea-rinoa --url ${{ secrets.RIKKU_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+  #         tea login default gitea-rinoa
+  #         echo "Merging PR..."
+  #         pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --fields index,title,head,state --output csv | egrep ${{ github.ref_name }} | awk -F"," '{print $1}' | sed -e 's|"||g')
+  #         tea pr m --repo ${{ github.repository }} --title "Auto Merge of PR ${pr_index} - ${{ github.ref_name }}" --message "Merged by ${{ github.actor }}" ${pr_index}
+  #         echo "pr_index=${pr_index}" >> $GITHUB_OUTPUT
+  #     - name: Gotify Notification
+  #       uses: eikendev/gotify-action@master
+  #       with:
+  #         gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+  #         gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+  #         notification_title: 'GITEA: PR Merge Successful'
+  #         notification_message: 'PR #${{ steps.pr_merge.outputs.pr_index }} merged.'
+  # docker-compose-deploy:
+  #   name: Docker Compose Deployment
+  #   runs-on: ubuntu-latest
+  #   needs: [generate-service-list, docker-compose-dry-run, pr-merge]
+  #   env:
+  #     VAULT_ADDR: ${{ secrets.RIKKU_VAULT_ADDR }}
+  #     VAULT_TOKEN: ${{ secrets.VAULT_GITEA_TOKEN }}
+  #     DOCKER_HOST: tcp://dockerproxy:2375
+  #     RIKKU_REGISTRY_PASSWORD: ${{ secrets.BOT_GITEA_PASSWORD }}
+  #     DOCKER_SVC_LIST: ${{ needs.generate-service-list.outputs.svc_deploy_list }}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ref: main
+  #     - name: Cache Vault install
+  #       id: cache-vault
+  #       uses: actions/cache@v4
+  #       with:
+  #         path: /opt/hostedtoolcache/vault/${{ env.HC_VAULT_VERSION }}/x64
+  #         key: vault-${{ runner.os }}-${{ env.HC_VAULT_VERSION }}
+  #     - name: Install Vault (only if not cached)
+  #       if: steps.cache-vault.outputs.cache-hit != 'true'
+  #       uses: cpanato/vault-installer@main
+  #       with:
+  #         version: ${{ env.HC_VAULT_VERSION }}
+  #     - name: Login to Gitea Container Registry
+  #       run: |
+  #         docker login -u gitea-sonarqube-bot -p ${RIKKU_REGISTRY_PASSWORD} git.trez.wtf
+  #     - name: Gotify Notification
+  #       uses: eikendev/gotify-action@master
+  #       with:
+  #         gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+  #         gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+  #         notification_title: 'GITEA: Docker Compose Deployment @ Rinoa'
+  #         notification_message: 'Starting Docker Compose run...'
+  #     - name: Generate .env file for deployment
+  #       run: |
+  #          vault kv get -format=json rikku-docker/env | jq -r '.data.data' | jq -r 'keys[] as $k | "\($k)='\''\(.[$k])'\''"' > .env
+  #          echo ${DOCKER_SVC_LIST}
+  #     - name: Docker Compose Deployment
+  #       uses: hoverkraft-tech/compose-action@v2.2.0
+  #       env:
+  #         DOCKER_HOST: tcp://dockerproxy:2375
+  #       with:
+  #         services: |
+  #           ${{ needs.generate-service-list.outputs.svc_deploy_list }}
+  #         up-flags: -d --remove-orphans
+  #         down-flags: --dry-run
+  #     - name: Docker Compose Healthcheck
+  #       uses: jaracogmbh/docker-compose-health-check-action@v1.0.0
+  #       with:
+  #         max-retries: 30
+  #         retry-interval: 10
+  #         compose-file: "docker-compose.yml"
+  #         skip-exited: "true"
+  #         skip-no-healthcheck: "true"
+  #     - name: Gotify Notification
+  #       uses: eikendev/gotify-action@master
+  #       with:
+  #         gotify_api_base: '${{ secrets.RIKKU_GOTIFY_URL }}'
+  #         gotify_app_token: '${{ secrets.RIKKU_RUNNER_GOTIFY_TOKEN }}'
+  #         notification_title: 'GITEA: Docker Compose Deployment @ Rinoa'
+  #         notification_message: 'Deployment completed successfully.'
@@ -1,43 +1,50 @@
-*.csr
-*.crt
-*.key
-*.pem
-secrets.yaml
-ip_bans.yaml
-known_devices.yaml
-google_calendars.yaml
-entity_registry.yaml
-*.json
-*.conf
+# Generic ignores
 *.log
-*.txt
-*.sh
-*.json
-*.xml
-*.sqlite
-ozw_config/
-tts/
-deps/
-n.jpg
-r.jpg
-p.jpg
-*.json
-cox_usage.json
-cox_usage.py
-*.pyc
 *.log.*
-blueprints/
-govee_learning.yaml
-zigbee.db*
-timelapse/*
-www/winlab/*
-www/timelapse/*
-www/community/lovelace-card-mod/card-mod.js
-www/community/lovelace-card-mod/card-mod.js.gz
-json
-**addons*/./image/58647060c161423a19fa911c0b16bf1f/original
-./image/58647060c161423a19fa911c0b16bf1f/512x512
-./image/04fe2e85a69341a59a718100477569b1/original
-./image/04fe2e85a69341a59a718100477569b1/512x512
-./www/mail_and_packages/ra_0_mailerProvidedImage0
-./www/mail_and_packages/mailerProvidedImage0
+*.db
+*.db-shm
+*.db-wal
+*.pyc
+._*
+__pycache__
+
+# Directory (contents) ignores
+.cloud
+.storage
+deps
+
+# Specific file ignores
+core
+image
+ip_bans.yaml
+secrets.yaml
+
+# Build-in blueprints ignores
+blueprints/*/homeassistant
+
+# ESPHome ignores
+esphome/.*/
+
+# Ignore add-on files
+aircast.xml
+airsonos.xml
+notebooks
+
+# Ignore files created by IDE's
+.vscode
+.theia
+.Trash*
+
+# Ignore vendored stuff
+custom_components
+themes
+www/community
+
+# Specific keeps
+!.gitkeep
+
+# Temporary ignores
+.old_config
+
+# envs
+**/.env
@@ -1 +0,0 @@
-# TBD
@@ -1,13 +0,0 @@
-#============================#
-# ALEXBELGIUM'S ENV INJECTOR #
-#============================#
-#
-# All env variables set in this file will be enabled in the app
-# This allows enabling more options that normally available in the addon options
-# This file must be filled according to the yaml format.
-# If the format is invalid, the addon will note an error.
-# To validate your yaml, you can use the free online tool http://www.yamllint.com/
-
-# EXAMPLE of the format (you need to remove the # for it to become active)
-# TZ: Europe/Paris
-
@@ -1,13 +0,0 @@
-#============================#
-# ALEXBELGIUM'S ENV INJECTOR #
-#============================#
-#
-# All env variables set in this file will be enabled in the app
-# This allows enabling more options that normally available in the addon options
-# This file must be filled according to the yaml format.
-# If the format is invalid, the addon will note an error.
-# To validate your yaml, you can use the free online tool http://www.yamllint.com/
-
-# EXAMPLE of the format (you need to remove the # for it to become active)
-# TZ: Europe/Paris
-
@@ -0,0 +1,180 @@
+http:
+  pprof:
+    port: 6060
+    enabled: false
+  address: 127.0.0.1:45158
+  session_ttl: 720h
+users: []
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: ""
+theme: auto
+dns:
+  bind_hosts:
+    - 192.168.1.252
+    - fe80::b978:acda:fbab:ca7a%wlan0
+    - 172.30.32.1
+    - 127.0.0.1
+    - ::1
+  port: 53
+  anonymize_client_ip: false
+  ratelimit: 20
+  ratelimit_subnet_len_ipv4: 24
+  ratelimit_subnet_len_ipv6: 56
+  ratelimit_whitelist: []
+  refuse_any: true
+  upstream_dns:
+    - 192.168.1.254
+  upstream_dns_file: ""
+  bootstrap_dns:
+    - 1.1.1.1:53
+  fallback_dns: []
+  upstream_mode: load_balance
+  fastest_timeout: 1s
+  allowed_clients: []
+  disallowed_clients: []
+  blocked_hosts:
+    - version.bind
+    - id.server
+    - hostname.bind
+  trusted_proxies:
+    - 127.0.0.0/8
+    - ::1/128
+  cache_size: 4194304
+  cache_ttl_min: 0
+  cache_ttl_max: 0
+  cache_optimistic: false
+  bogus_nxdomain: []
+  aaaa_disabled: false
+  enable_dnssec: false
+  edns_client_subnet:
+    custom_ip: ""
+    enabled: false
+    use_custom: false
+  max_goroutines: 300
+  handle_ddr: true
+  ipset: []
+  ipset_file: ""
+  bootstrap_prefer_ipv6: false
+  upstream_timeout: 10s
+  private_networks: []
+  use_private_ptr_resolvers: false
+  local_ptr_upstreams: []
+  use_dns64: false
+  dns64_prefixes: []
+  serve_http3: false
+  use_http3_upstreams: false
+  serve_plain_dns: true
+  hostsfile_enabled: true
+  pending_requests:
+    enabled: true
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 853
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+  strict_sni_check: false
+querylog:
+  dir_path: ""
+  ignored: []
+  interval: 2160h
+  size_memory: 1000
+  enabled: true
+  file_enabled: true
+statistics:
+  dir_path: ""
+  ignored: []
+  interval: 24h
+  enabled: true
+filters:
+  - enabled: true
+    url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt
+    name: AdGuard DNS filter
+    id: 1
+  - enabled: false
+    url: https://adguardteam.github.io/HostlistsRegistry/assets/filter_2.txt
+    name: AdAway Default Blocklist
+    id: 2
+whitelist_filters: []
+user_rules: []
+dhcp:
+  enabled: true
+  interface_name: wlan0
+  local_domain_name: lan
+  dhcpv4:
+    gateway_ip: 192.168.1.1
+    subnet_mask: 255.255.255.0
+    range_start: 192.168.1.2
+    range_end: 192.168.1.254
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: []
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+filtering:
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_services:
+    schedule:
+      time_zone: America/New_York
+    ids: []
+  protection_disabled_until: null
+  safe_search:
+    enabled: false
+    bing: true
+    duckduckgo: true
+    ecosia: true
+    google: true
+    pixabay: true
+    yandex: true
+    youtube: true
+  blocking_mode: default
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  rewrites: []
+  safe_fs_patterns: []
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  filters_update_interval: 24
+  blocked_response_ttl: 10
+  filtering_enabled: false
+  parental_enabled: false
+  safebrowsing_enabled: false
+  protection_enabled: true
+clients:
+  runtime_sources:
+    whois: true
+    arp: true
+    rdns: false
+    dhcp: true
+    hosts: true
+  persistent: []
+log:
+  enabled: true
+  file: ""
+  max_backups: 0
+  max_size: 100
+  max_age: 3
+  compress: false
+  local_time: false
+  verbose: false
+os:
+  group: ""
+  user: ""
+  rlimit_nofile: 0
+schema_version: 29
@@ -0,0 +1 @@
+2025.8.0
@@ -9,11 +9,6 @@ automation: !include automations.yaml
 script: !include scripts.yaml
 scene: !include scenes.yaml

-device_tracker:
-  - platform: quantum_gateway
-    host: 192.168.1.1
-    password: !secret fios_gateway_password
-
 http:
  use_x_forwarded_for: true
  trusted_proxies: 192.168.1.254
--- a/Show More
+++ b/Show More