Re-adding Hashicorp Vault.

Merged by Trez.One

.gitea/workflows/deployment.yml

@@ -17,15 +17,15 @@ jobs:
       - name: PR list
         id: list-prs
         run: |
-          curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
+          pr_check=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} \
-          chmod +x /usr/local/bin/tea
+            -X 'GET' \
-          echo "Listing PRs..."
+            -H 'Accept: application/json' \
-          tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+            -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
-          pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open|closed|merged' | awk -F, '{print $3}' | sed -e 's|"||g')
+            -s | jq '{index: .number, state: .state}')
-          echo "pr_state=$(echo ${pr_state})" >> "$GITHUB_OUTPUT"
+          pr_state=$(echo ${pr_check} | jq -r '.state')
 
       - name: Create PR
-        if: steps.list-prs.outputs.pr_state == 'closed'
+        if: steps.list-prs.outputs.pr_state != 'open'
         uses: arifer612/Gitea-PR-action@v1.2.0
         with:
           url: ${{ gitea.server_url }}

docker-compose.yml

@@ -1735,49 +1735,6 @@ services:
         target: /var/www/html/app/migrations
         type: volume
         volume: {}
-  huginn:
-    container_name: huginn
-    environment:
-      HUGINN_DATABASE_HOST: mariadb
-      HUGINN_DATABASE_NAME: huginn
-      HUGINN_DATABASE_PASSWORD: MLbKPT3j9TYcguYevFRcfEcrXtL4kcxujtrNdrq9eCig4WhUbxkyLoAiCPpm4zob
-      HUGINN_DATABASE_PORT: "3306"
-      HUGINN_DATABASE_USERNAME: huginn
-      PGID: "1000"
-      PUID: "1000"
-      TZ: America/New_York
-    hostname: Rinoa
-    image: ghcr.io/huginn/huginn
-    labels:
-      - homepage.group=Automation
-      - homepage.name=Huginn
-      - homepage.href=https://huginn.${MY_TLD}
-      - homepage.icon=huginn
-      - homepage.description=Agent/Web Automation
-      - swag=enable
-      - swag_port=3000
-      - swag_proto=http
-      - swag.uptime-kuma.enabled=true
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "3005"
-        target: 3000
-    restart: unless-stopped
-    volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
   hugo:
     command: hugo server --baseURL "it-services.trez.wtf" --bind 0.0.0.0 --appendPort=false --source=/src/it-services --configDir=/src/it-services/config/ -e production --logLevel debug
     container_name: hugo
@@ -3168,7 +3125,7 @@ services:
       - homepage.description=
       - swag=enable
       - swag_proto=http
-      - swag_port=46717
+      - swag_port=80
       - swag_url=mesh.${MY_TLD}
     ports:
       - 46717:80 # HTTP
@@ -3269,6 +3226,33 @@ services:
         type: bind
         bind:
           create_host_path: true
+  n8n:
+    container_name: n8n
+    environment:
+      N8N_HOST: n8n.${MY_TLD}
+      N8N_PORT: 5678
+      N8N_PROTOCOL: https
+      NODE_ENV: production
+      WEBHOOK_URL: https://n8n.${MY_TLD}/
+      GENERIC_TIMEZONE: ${TZ}
+    image: docker.n8n.io/n8nio/n8n
+    labels:
+      swag: enable
+      swag_proto: http
+      swag_port: 5678
+      swag_url: n8n.${MY_TLD}
+      swag.uptime-kuma.enabled: true
+      swag.uptime-kuma.monitor.url: https://n8n.${MY_TLD}
+      homepage.group: Automation
+      homepage.name: n8n
+      homepage.href: https://n8n.${MY_TLD}
+      homepage.icon: n8n.svg
+      homepage.description: Extendable workflow automation tool to easily automate tasks
+    ports:
+      - 5678:5678
+    restart: unless-stopped
+    volumes:
+      - n8n-data:/home/node/.n8n
   navidrome:
     container_name: navidrome
     environment:
@@ -3630,58 +3614,6 @@ services:
       - plausible-event-logs:/var/log/clickhouse-server
       - ${DOCKER_VOLUME_CONFIG}/plausible/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
       - ${DOCKER_VOLUME_CONFIG}/plausible/clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
-  portainer:
-    command:
-      - -H
-      - unix:///var/run/docker.sock
-    container_name: portainer
-    environment:
-      - TZ=America/New_York
-      - DOCKER_MODS=ghcr.io/themepark-dev/theme.park:portainer
-    hostname: Rinoa
-    image: portainer/portainer-ce:latest
-    labels:
-      - homepage.group=System Administration
-      - homepage.name=Portainer
-      - homepage.href=https://portainer.${MY_TLD}
-      - homepage.icon=portainer.png
-      - homepage.description=Docker container management
-      - homepage.widget.type=portainer
-      - homepage.widget.url=http://portainer:9000
-      - homepage.widget.env=1
-      - homepage.widget.key=${PORTAINER_API_KEY}
-      - swag=enable
-      - swag.uptime-kuma.enabled=true
-    networks:
-      default: null
-    ports:
-      - mode: ingress
-        protocol: tcp
-        published: "9000"
-        target: 9000
-    restart: unless-stopped
-    volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/portainer
-        target: /data
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /rinoa-storage
-        target: /storage
-        type: bind
-      - bind:
-          create_host_path: true
-        source: /var/run/docker.sock
-        target: /var/run/docker.sock
-        type: bind
   postal-smtp:
     cap_add:
       - NET_BIND_SERVICE
@@ -4599,6 +4531,27 @@ services:
         type: bind
         bind:
           create_host_path: true
+  spotisub:
+    container_name: spotisub
+    environment:
+      SPOTIPY_CLIENT_ID: ${YOUR_SPOTIFY_ID}
+      SPOTIPY_CLIENT_SECRET: ${YOUR_SPOTIFY_SECRET}
+      SPOTIPY_REDIRECT_URI: http://127.0.0.1:8080/
+      SUBSONIC_API_HOST: http://navidrome
+      SUBSONIC_API_PORT: 4533
+      SUBSONIC_API_USER: ${NAVIDROME_USERNAME}
+      SUBSONIC_API_PASS: ${NAVIDROME_PASSWORD}
+    healthcheck:
+      test: curl -s http://127.0.0.1:5183/api/v1/utils/healthcheck | grep -q 'Ok!' || exit 1
+      interval: 30s
+      retries: 20
+      start_period: 30s
+    image: blastbeng/spotisub:latest
+    ports:
+      - 5183:5183
+    restart: always
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/spotisub:/home/user/spotisub/cache
   swag:
     cap_add:
       - NET_ADMIN
@@ -6092,6 +6045,35 @@ services:
         source: /etc/localtime
         target: /etc/localtime
         type: bind
+  vault:
+    cap_add:
+      - IPC_LOCK
+    command:
+      - server
+    container_name: hc-vault
+    environment:
+      - AWS_ACCESS_KEY_ID=${VAULT_HASHICORP_AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${VAULT_HASHICORP_AWS_SECRET_ACCESS_KEY}
+    image: hashicorp/vault:latest
+    labels:
+      - homepage.group=Code
+      - homepage.name=Vault
+      - homepage.icon=vault.png
+      - homepage.href=https://vault.${MY_TLD}
+      - homepage.description=Hashicorp Vault for secrets, key/value stores, etc.
+      - swag=enable
+      - swag_proto=http
+      - swag_port=8200
+      - swag_url=vault.${MY_TLD}
+      - swag.uptime-kuma.enabled=true
+      - swag.uptime-kuma.monitor.url=https://vault.${MY_TLD}
+    ports:
+      - 8200:8200
+      - 8250:8250
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/config/:/vault/config
+      - ${DOCKER_VOLUME_CONFIG}/hashicorp-vault/logs/:/vault/logs
   wallabag:
     container_name: wallabag
     depends_on:
@@ -7086,6 +7068,8 @@ volumes:
     name: compose_mongo1_config
   mongodb_data:
     name: compose_mongo1_data
+  n8n-data:
+    name: n8n-data
   netbox-pg-db:
     name: netbox-pg-db
   ollama: