From d10d9de625752334bab3aa98c38d87d1f6ac67da Mon Sep 17 00:00:00 2001 From: geezo Date: Sat, 10 May 2025 12:01:29 -0400 Subject: [PATCH] changes --- .gitea/workflows/ntfy.yaml | 54 +++++++++---------- Caddyfile | 55 ------------------- {ntfy => _archive/ntfy}/docker-compose.yml | 0 glance/config/glance.yaml | 51 ++++++++++++++++++ glance/config/glance.yml | 28 ++++++++-- glance/glance.yaml | 51 ++++++++++++++++++ nextcloud/docker-compose.yml | 2 +- vaultwarden/docker-compose.yml | 6 +++ yams/docker-compose.yml | 63 ---------------------- 9 files changed, 159 insertions(+), 151 deletions(-) delete mode 100644 Caddyfile rename {ntfy => _archive/ntfy}/docker-compose.yml (100%) create mode 100644 glance/config/glance.yaml create mode 100644 glance/glance.yaml diff --git a/.gitea/workflows/ntfy.yaml b/.gitea/workflows/ntfy.yaml index 2cea016..3a6f53a 100644 --- a/.gitea/workflows/ntfy.yaml +++ b/.gitea/workflows/ntfy.yaml @@ -1,31 +1,31 @@ -name: Gitea Actions Demo -run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +# name: Gitea Actions Demo +# run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 -on: - workflow_dispatch: - push: - paths: - - ntfy/** +# on: +# workflow_dispatch: +# push: +# paths: +# - ntfy/** -env: - app_folder: ntfy +# env: +# app_folder: ntfy -jobs: - Explore-Gitea-Actions: - runs-on: ubuntu-latest - steps: - - name: Execute remote SSH commands using password - uses: appleboy/ssh-action@v1 - with: - host: ${{ secrets.HOST }} - username: geezo - password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - script: | - cd /home/geezo/docker_containers && \ - if ./restart_container.sh ${{ env.app_folder }}; then - ./send_notification.sh -m "Successfully updated ${{ env.app_folder }} container" - else - ./send_notification.sh -m "Failed to update ${{ env.app_folder }} container" - fi +# jobs: +# Explore-Gitea-Actions: +# runs-on: ubuntu-latest +# steps: +# - name: Execute remote SSH commands using password +# uses: appleboy/ssh-action@v1 +# with: +# host: ${{ secrets.HOST }} +# username: geezo +# password: ${{ secrets.PASSWORD }} +# port: ${{ secrets.PORT }} +# script: | +# cd /home/geezo/docker_containers && \ +# if ./restart_container.sh ${{ env.app_folder }}; then +# ./send_notification.sh -m "Successfully updated ${{ env.app_folder }} container" +# else +# ./send_notification.sh -m "Failed to update ${{ env.app_folder }} container" +# fi diff --git a/Caddyfile b/Caddyfile deleted file mode 100644 index ba7b4fb..0000000 --- a/Caddyfile +++ /dev/null @@ -1,55 +0,0 @@ -# Global options -{ - admin off - auto_https off -} - -# Jellyfin - Media Server -jellyfin.localhost { - reverse_proxy localhost:2000 -} - -# qBittorrent - Torrent Client -qbittorrent.localhost { - reverse_proxy localhost:2001 -} - -# SABnzbd - Usenet Client -sabnzbd.localhost { - reverse_proxy localhost:2002 -} - -# Sonarr - TV Show Management -sonarr.localhost { - reverse_proxy localhost:2003 -} - -# Radarr - Movie Management -radarr.localhost { - reverse_proxy localhost:2004 -} - -# Lidarr - Music Management -lidarr.localhost { - reverse_proxy localhost:2006 -} - -# Readarr - Book Management -readarr.localhost { - reverse_proxy localhost:2007 -} - -# Bazarr - Subtitle Management -bazarr.localhost { - reverse_proxy localhost:2008 -} - -# Prowlarr - Indexer Management -prowlarr.localhost { - reverse_proxy localhost:2009 -} - -# Gluetun Admin Interface -gluetun.localhost { - reverse_proxy localhost:8003 -} \ No newline at end of file diff --git a/ntfy/docker-compose.yml b/_archive/ntfy/docker-compose.yml similarity index 100% rename from ntfy/docker-compose.yml rename to _archive/ntfy/docker-compose.yml diff --git a/glance/config/glance.yaml b/glance/config/glance.yaml new file mode 100644 index 0000000..5061de3 --- /dev/null +++ b/glance/config/glance.yaml @@ -0,0 +1,51 @@ +bookmarks: + - name: Jellyfin + icon: si:jellyfin + url: https://jellyfin.theocorp + description: Media Server + hide: false + - name: qBittorrent + icon: si:qbittorrent + url: https://qbittorrent.theocorp + description: Torrent Client + hide: false + - name: SABnzbd + icon: si:sabnzbd + url: https://sabnzbd.theocorp + description: Usenet Client + hide: false + - name: Sonarr + icon: si:sonarr + url: https://sonarr.theocorp + description: TV Show Management + hide: false + - name: Radarr + icon: si:radarr + url: https://radarr.theocorp + description: Movie Management + hide: false + - name: Lidarr + icon: si:lidarr + url: https://lidarr.theocorp + description: Music Management + hide: false + - name: Readarr + icon: si:readarr + url: https://readarr.theocorp + description: Book Management + hide: false + - name: Bazarr + icon: si:bazarr + url: https://bazarr.theocorp + description: Subtitle Management + hide: false + - name: Prowlarr + icon: si:prowlarr + url: https://prowlarr.theocorp + description: Indexer Management + hide: false + - name: Gluetun + icon: si:gluetun + url: https://gluetun.theocorp + description: VPN Client + hide: false \ No newline at end of file diff --git a/glance/config/glance.yml b/glance/config/glance.yml index 1175464..80575f8 100644 --- a/glance/config/glance.yml +++ b/glance/config/glance.yml @@ -31,11 +31,29 @@ pages: url: http://minio.theocorp - title: Pihole url: http://pihole.local - - title: MiniO - url: http://minio.theocorp - - title: MiniO - url: http://minio.theocorp - - title: 3rd Party Services + - title: Media + links: + - title: Jellyfin + url: https://jellyfin.theocorp + - title: qBittorrent + url: https://qbittorrent.theocorp + - title: SABnzbd + url: https://sabnzbd.theocorp + - title: Sonarr + url: https://sonarr.theocorp + - title: Radarr + url: https://radarr.theocorp + - title: Lidarr + url: https://lidarr.theocorp + - title: Readarr + url: https://readarr.theocorp + - title: Bazarr + url: https://bazarr.theocorp + - title: Prowlarr + url: https://prowlarr.theocorp + - title: Gluetun + url: https://gluetun.theocorp + - title: 3rd Party Services links: - title: Cloudflare url: https://example.com diff --git a/glance/glance.yaml b/glance/glance.yaml new file mode 100644 index 0000000..5061de3 --- /dev/null +++ b/glance/glance.yaml @@ -0,0 +1,51 @@ +bookmarks: + - name: Jellyfin + icon: si:jellyfin + url: https://jellyfin.theocorp + description: Media Server + hide: false + - name: qBittorrent + icon: si:qbittorrent + url: https://qbittorrent.theocorp + description: Torrent Client + hide: false + - name: SABnzbd + icon: si:sabnzbd + url: https://sabnzbd.theocorp + description: Usenet Client + hide: false + - name: Sonarr + icon: si:sonarr + url: https://sonarr.theocorp + description: TV Show Management + hide: false + - name: Radarr + icon: si:radarr + url: https://radarr.theocorp + description: Movie Management + hide: false + - name: Lidarr + icon: si:lidarr + url: https://lidarr.theocorp + description: Music Management + hide: false + - name: Readarr + icon: si:readarr + url: https://readarr.theocorp + description: Book Management + hide: false + - name: Bazarr + icon: si:bazarr + url: https://bazarr.theocorp + description: Subtitle Management + hide: false + - name: Prowlarr + icon: si:prowlarr + url: https://prowlarr.theocorp + description: Indexer Management + hide: false + - name: Gluetun + icon: si:gluetun + url: https://gluetun.theocorp + description: VPN Client + hide: false \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 66338dd..840a5e2 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -37,7 +37,7 @@ services: labels: glance.name: NextCloud glance.icon: si:nextcloud - glance.url: https://cloud.geezo.io + glance.url: https://cloud.geezo.site glance.description: Private Cloud glance.hide: false diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml index 032d1b1..db8ac56 100644 --- a/vaultwarden/docker-compose.yml +++ b/vaultwarden/docker-compose.yml @@ -11,6 +11,12 @@ services: - 1008:80 networks: - default + labels: + glance.name: Vaultwarden + glance.icon: si:vaultwarden + glance.url: https://vaultwarden.geezo.site + glance.description: Password manager + glance.hide: false volumes: diff --git a/yams/docker-compose.yml b/yams/docker-compose.yml index da3384b..e7962ff 100644 --- a/yams/docker-compose.yml +++ b/yams/docker-compose.yml @@ -41,12 +41,6 @@ services: depends_on: gluetun: condition: service_healthy - labels: - glance.name: qBittorrent - glance.icon: si:qbittorrent - glance.url: https://qbittorrent.theocorp - glance.description: Torrent Client - glance.hide: false # SABnzbd is used to download from usenet sabnzbd: image: lscr.io/linuxserver/sabnzbd:latest @@ -63,12 +57,6 @@ services: #- 8080:8080 # sabnzbd restart: unless-stopped network_mode: service:gluetun - labels: - glance.name: SABnzbd - glance.icon: si:sabnzbd - glance.url: https://sabnzbd.theocorp - glance.description: Usenet Client - glance.hide: false # Sonarr is used to query, add downloads to the download queue and index TV shows # https://sonarr.tv/ sonarr: @@ -84,12 +72,6 @@ services: ports: - 2003:8989 restart: unless-stopped - labels: - glance.name: Sonarr - glance.icon: si:sonarr - glance.url: https://sonarr.theocorp - glance.description: TV Show Management - glance.hide: false # Radarr is used to query, add downloads to the download queue and index Movies # https://radarr.video/ radarr: @@ -105,12 +87,6 @@ services: ports: - 2004:7878 restart: unless-stopped - labels: - glance.name: Radarr - glance.icon: si:radarr - glance.url: https://radarr.theocorp - glance.description: Movie Management - glance.hide: false # Lidarr is used to query, add downloads to the download queue and index Music # https://lidarr.audio/ lidarr: @@ -126,12 +102,6 @@ services: ports: - 2006:8686 restart: unless-stopped - labels: - glance.name: Lidarr - glance.icon: si:lidarr - glance.url: https://lidarr.theocorp - glance.description: Music Management - glance.hide: false # Readarr is used to query, add downloads to the download queue and index Audio and Ebooks # https://readarr.com/ readarr: @@ -147,12 +117,6 @@ services: ports: - 2007:8787 restart: unless-stopped - labels: - glance.name: Readarr - glance.icon: si:readarr - glance.url: https://readarr.theocorp - glance.description: Book Management - glance.hide: false # Bazarr is used to download and categorize subtitles # https://www.bazarr.media/ bazarr: @@ -168,12 +132,6 @@ services: ports: - 2008:6767 restart: unless-stopped - labels: - glance.name: Bazarr - glance.icon: si:bazarr - glance.url: https://bazarr.theocorp - glance.description: Subtitle Management - glance.hide: false # Prowlarr is our torrent indexer/searcher. Sonarr/Radarr use Prowlarr as a source # https://prowlarr.com/ prowlarr: @@ -188,12 +146,6 @@ services: ports: - 2009:9696 restart: unless-stopped - labels: - glance.name: Prowlarr - glance.icon: si:prowlarr - glance.url: https://prowlarr.theocorp - glance.description: Indexer Management - glance.hide: false # Gluetun is our VPN, so you can download torrents safely gluetun: image: qmcgaw/gluetun:v3 @@ -220,19 +172,4 @@ services: - VPN_PORT_FORWARDING=on restart: unless-stopped network_mode: bridge - labels: - glance.name: Gluetun - glance.icon: si:gluetun - glance.url: https://gluetun.theocorp - glance.description: VPN Client - glance.hide: false - # Watchtower is going to keep our instances updated - # watchtower: - # image: containrrr/watchtower - # container_name: watchtower-yams - # environment: - # - WATCHTOWER_CLEANUP=true - # volumes: - # - /var/run/docker.sock:/var/run/docker.sock - # restart: unless-stopped networks: {}