From b7a72487d839ceb22b1ac62faa8367fdc6cf7391 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 22 Jun 2025 18:07:02 -0400 Subject: [PATCH 1/5] Adding Argus config. --- ansible/app-configs/argus/config.yml.j2 | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 ansible/app-configs/argus/config.yml.j2 diff --git a/ansible/app-configs/argus/config.yml.j2 b/ansible/app-configs/argus/config.yml.j2 new file mode 100644 index 00000000..c5220f2b --- /dev/null +++ b/ansible/app-configs/argus/config.yml.j2 @@ -0,0 +1,36 @@ +settings: + log: + level: INFO # Log level, DEBUG/VERBOSE/INFO/WARNING/ERROR + timestamps: false # Log with timestamps + data: + database_file: data/argus.db # SQLite DB file used to track the state of services + web: + listen_host: 0.0.0.0 # IP address to listen on + listen_port: 8080 # Port to listen on + route_prefix: / # Web route prefix, e.g. /demo means http://IP:PORT/demo to access + # cert_file: '' # HTTPS Cert path, e.g. `cert.pem` + # pkey_file: '' # HTTPS PrivKey path, e.g. `privkey.pem` + basic_auth: + username: 'admin' # Basic auth username, e.g. `admin` + password: '{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['ARGUS_WEB_PASSWORD'] }}' # Basic auth password, e.g. `test123` + disabled_routes: [] # API Routes to disable (see below) + favicon: + png: '' # Override /apple-touch-icon.png (e.g. https://example.com/apple-touch-icon.png) + svg: '' # Override /favicon.svg (e.g. https://example.com/favicon.svg) +notify: + rinoa-gotify: + type: gotify + url_fields: + Host: gotify + Token: {{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token_cleaned)['secret']['ARGUS_WEB_PASSWORD'] }} + params: + Title: Argus @ Rinoa +service: + release-argus/argus: + latest_version: + type: github + url: release-argus/argus + dashboard: + icon: https://raw.githubusercontent.com/release-argus/Argus/master/web/ui/react-app/public/favicon.svg + icon_link-to: https://release-argus.io + web_url: https://github.com/release-argus/Argus/blob/master/CHANGELOG.md From c511c1f9065f8f42bb0bc5b45522c9a9eb0fe99d Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 22 Jun 2025 18:07:02 -0400 Subject: [PATCH 2/5] Layout change for Lifestyle group. --- ansible/app-configs/homepage/settings.yaml.j2 | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/ansible/app-configs/homepage/settings.yaml.j2 b/ansible/app-configs/homepage/settings.yaml.j2 index 80c1b73d..c14060f8 100644 --- a/ansible/app-configs/homepage/settings.yaml.j2 +++ b/ansible/app-configs/homepage/settings.yaml.j2 @@ -35,19 +35,15 @@ layout: columns: 4 Lifestyle: style: row - columns: 4 + columns: 3 Automation: style: row columns: 5 Privacy/Security: style: row -<<<<<<< Updated upstream - columns: 5 + columns: 3 Personal Tools: style: row - columns: 5 -<<<<<<< HEAD -======= columns: 3 Personal Tools: style: row @@ -55,18 +51,12 @@ layout: Professional Services: style: row columns: 3 ->>>>>>> Stashed changes -======= - Professional Tools: - style: row - columns: 3 ->>>>>>> refs/remotes/origin/main Servarr Stack: style: row columns: 3 Downloaders: style: row - columns: + columns: 3 Media Library: style: row columns: 3 From 3e03cf72ce242d616820d4d7189763d63c5db7d4 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 22 Jun 2025 18:07:02 -0400 Subject: [PATCH 3/5] Decreasing timeout for service health check. --- .gitea/workflows/pr-cloudflare-docker-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml index e39fc281..93dadf80 100644 --- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml +++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml @@ -349,7 +349,7 @@ jobs: uses: thegabriele97/dockercompose-health-action@main with: filename: 'docker-compose.yml' - timeout: '180' + timeout: '60' workdir: '.' - name: Gotify Notification uses: eikendev/gotify-action@master From b544b6202d2c7c11b157cb9f439218b017fc1acd Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 22 Jun 2025 18:07:02 -0400 Subject: [PATCH 4/5] Adding Argus and Plant-It services ; AdGuard modification. --- docker-compose.yml | 90 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 70df08c4..684977f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -164,7 +164,6 @@ services: # - 67:67 # - 688:68 restart: unless-stopped - user: 1000:1000 volumes: - /etc/localtime:/etc/localtime:ro - ${DOCKER_VOLUME_CONFIG}/adguard/work:/opt/adguardhome/work @@ -227,6 +226,34 @@ services: volumes: - ${DOCKER_VOLUME_CONFIG}/archivebox:/data # ./data/personas/Default/chrome_profile/Default:/data/personas/Default/chrome_profile/Default + argus: + container_name: argus + environment: + ARGUS_UID: ${PUID} + ARGUS_GID: ${PGID} + healthcheck: + test: ["CMD", "/healthcheck", "http://localhost:8080/api/v1/healthcheck"] + interval: 1m + timeout: 10s + retries: 3 + start_period: 10s + image: quay.io/argus-io/argus:latest + labels: + swag: enable + swag_proto: http + swag_port: 8080 + swag_url: adgh.${MY_TLD} + homepage.group: System Administration + homepage.name: Argus + homepage.icon: release-argus.png + homepage.href: https://argus.${MY_TLD} + homepage.description: Software release monitoring and notifications + ports: + - 9857:8080 + restart: always + volumes: + - ${DOCKER_VOLUME_CONFIG}/argus/config.yml:/app/config.yml + - ${DOCKER_VOLUME_CONFIG}/argus/:/app/data/ audiobookshelf: container_name: audiobookshelf environment: @@ -2996,7 +3023,7 @@ services: LLDAP_LDAP_BASE_DN: dc=trez,dc=wtf image: lldap/lldap:stable labels: - homepage.group: System Administration + homepage.group: Privacy/Security homepage.name: LLDAP homepage.href: https://ldap.${MY_TLD} homepage.icon: /icons/lldap.png @@ -3855,6 +3882,65 @@ services: restart: on-failure volumes: - planka-db-data:/var/lib/postgresql/data + plant-it: + image: msdeluise/plant-it-server:latest + depends_on: + - mariadb + - redis + environment: + MYSQL_HOST: mariadb + MYSQL_PORT: 3306 + MYSQL_USERNAME: plantit + MYSQL_PSW: ${PLANT-IT_DB_PASSWORD} + MYSQL_DATABASE: plantit + MYSQL_ROOT_PASSWORD: ${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} + JWT_SECRET: ${PLANT-IT_JWT_SECRET} + JWT_EXP: 1 + USERS_LIMIT: -1 # less then 0 means no limit + UPLOAD_DIR: /upload-dir # path to the directory used to store uploaded images, if on docker deployment leave as it is and change the volume binding in the docker-compose file if needed + API_PORT: 8080 + FLORACODEX_URL: https://api.floracodex.com + FLORACODEX_KEY: ${PLANT-IT_FLORACODEX_APP_KEY} + ALLOWED_ORIGINS: '*' # CORS allowed origins (comma separated list) + LOG_LEVEL: DEBUG # could be: DEBUG, INFO, WARN, ERROR + CONTACT_MAIL: noreply@${MY_TLD} # address used as "contact" for template email + REMINDER_NOTIFY_CHECK: 0 30 7 * * * # 6-values crontab expression to set the check time for reminders + MAX_REQUESTS_PER_MINUTE: 100 # rate limiting of the upcoming requests + NTFY_ENABLED: false # if "false" ntfy service won't be available as notification dispatcher + GOTIFY_ENABLED: true # if "false" ntfy service won't be available as notification dispatcher + CACHE_TYPE: redis # Cache type. By default, it's "redis" but can also be "none" + CACHE_TTL: 86400 + CACHE_HOST: redis + CACHE_PORT: 6379 + SMTP_HOST: postal-smtp + SMTP_PORT: 25 + SMTP_EMAIL: noreply@${MY_TLD} + SMTP_PASSWORD: ${POSTAL_SMTP_AUTH_PASSWORD} + SMTP_AUTH: true + SMTP_START_TTL: false + labels: + swag: enable + swag_proto: http + swag_port: 3000 + swag_url: plants.${MY_TLD} + swag.uptime-kuma.enabled: true + swag.uptime-kuma.monitor.url: https://portainer.${MY_TLD} + swag.uptime-kuma.monitor.interval: 300 + homepage.group: Lifestyle + homepage.name: Plant-It + homepage.href: https://plant.${MY_TLD} + homepage.icon: plant-it.png + homepage.description: 🪴 Self-hosted, open source gardening companion app + # homepage.widget.type: portainer + # homepage.widget.url: http://portainer:9000 + # homepage.widget.env: 7 + # homepage.widget.key: ${PORTAINER_HOMEPAGE_TOKEN} + ports: + - 64067:8080 + - 3460:3000 + restart: unless-stopped + volumes: + - ${DOCKER_VOLUME_CONFIG}/plant-it:/upload-dir plantuml-server: container_name: plantuml-server expose: From 103ebf9517fd042bfe88815a754428a620cf8fc5 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Sun, 22 Jun 2025 22:59:47 +0000 Subject: [PATCH 5/5] chore: Update README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 760753bd..55e31c55 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ | adguard | adguard/adguardhome:latest | | apprise-api | lscr.io/linuxserver/apprise-api:latest | | archivebox | archivebox/archivebox:latest | +| argus | quay.io/argus-io/argus:latest | | audiobookshelf | ghcr.io/advplyr/audiobookshelf:latest | | authelia | authelia/authelia:master | | authelia-pg | postgres:16-alpine | @@ -110,6 +111,7 @@ | pgbackweb-db | postgres:16-alpine | | planka | ghcr.io/plankanban/planka:2.0.0-rc.3 | | planka-pg-db | postgres:16-alpine | +| plant-it | msdeluise/plant-it-server:latest | | plantuml-server | plantuml/plantuml-server:jetty | | portainer | portainer/portainer-ce:alpine | | portnote-web | haedlessdev/portnote:latest |