From 96f24ad65a022e4e4df8463e3cc2260f7a294b08 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 16 Feb 2023 02:42:38 +0000 Subject: [PATCH] Update 4 files - /home/dot_config/docker/templates/healthchecks.docker-stack.yml.tmpl - /home/dot_config/docker/templates/portainer.docker-stack.yml.tmpl - /home/dot_config/docker/templates/statping.docker-stack.yml.tmpl - /home/.chezmoidata.yaml --- home/.chezmoidata.yaml | 13 +++++++++++++ .../templates/healthchecks.docker-stack.yml.tmpl | 10 +++++----- .../templates/portainer.docker-stack.yml.tmpl | 2 +- .../docker/templates/statping.docker-stack.yml.tmpl | 4 ++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 44f31871..090affbc 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -21,6 +21,19 @@ colors: color16: '#FFFFFF' config: gpg: https://raw.githubusercontent.com/drduh/config/master/gpg.conf +docker: + healthchecks: + allowedHosts: "*" + defaultFromEmail: no-reply@megabyte.space + siteLogoUrl: https://gitlab.com/megabyte-labs/misc/assets/-/raw/master/logo/color3@10x.png + siteName: Megabyte Labs Healthchecks + siteRoot: "/" + portainer: + siteLogoUrl: https://gitlab.com/megabyte-labs/misc/assets/-/raw/master/logo/color3@10x.png + templatesUrl: "" + statping: + description: Uptime monitoring for Megabyte Labs managed web services + name: Megabyte Labs Uptime Monitoring macosRemoteLogin: 'on' netdataClaimURL: https://app.netdata.cloud themeparkTheme: aquamarine diff --git a/home/dot_config/docker/templates/healthchecks.docker-stack.yml.tmpl b/home/dot_config/docker/templates/healthchecks.docker-stack.yml.tmpl index 7d039ba3..55159b03 100644 --- a/home/dot_config/docker/templates/healthchecks.docker-stack.yml.tmpl +++ b/home/dot_config/docker/templates/healthchecks.docker-stack.yml.tmpl @@ -11,14 +11,14 @@ services: - healthchecks_network - nginx_network environment: - ALLOWED_HOSTS: "{{ template.ALLOWED_HOSTS }}" + ALLOWED_HOSTS: "{{ .docker.healthchecks.allowedHosts }}" APPRISE_ENABLED: 'False' DB_HOST: postgres DB_NAME_FILE: /run/secrets/healthchecks_db_name DB_PASSWORD_FILE: /run/secrets/healthchecks_db_password DB_USER_FILE: /run/secrets/healthchecks_db_user DEBUG: 'False' - DEFAULT_FROM_EMAIL: "{{ template.DEFAULT_FROM_EMAIL }}" + DEFAULT_FROM_EMAIL: "{{ .docker.healthchecks.defaultFromEmail }}" EMAIL_HOST_PASSWORD_FILE: /run/secrets/healthchecks_sendgrid_api_key EMAIL_HOST_USER: apikey EMAIL_HOST: smtp.sendgrid.net @@ -30,9 +30,9 @@ services: REGENERATE_SETTINGS: 'True' SECRET_KEY_FILE: /run/secrets/healthchecks_secret_key SHELL_ENABLED: 'True' - SITE_LOGO_URL: "{{ template.SITE_LOGO_URL }}" - SITE_NAME: "{{ template.SITE_NAME }}" - SITE_ROOT: "{{ template.SITE_ROOT }}" + SITE_LOGO_URL: "{{ .docker.healthchecks.siteLogoUrl }}" + SITE_NAME: "{{ .docker.healthchecks.siteName }}" + SITE_ROOT: "{{ .docker.healthchecks.siteRoot }}" SLACK_CLIENT_ID_FILE: /run/secrets/healthchecks_slack_client_id SLACK_CLIENT_SECRET_FILE: /run/secrets/healthchecks_slack_client_secret SLACK_ENABLED: 'True' diff --git a/home/dot_config/docker/templates/portainer.docker-stack.yml.tmpl b/home/dot_config/docker/templates/portainer.docker-stack.yml.tmpl index efbdd0b2..f264d72d 100644 --- a/home/dot_config/docker/templates/portainer.docker-stack.yml.tmpl +++ b/home/dot_config/docker/templates/portainer.docker-stack.yml.tmpl @@ -16,7 +16,7 @@ services: portainer: image: portainer/portainer-ce:2.14.1 - command: -H tcp://tasks.agent:9001 --tlsskipverify --admin-password-file /run/secrets/portainer_admin_password --logo {{ template.SITE_LOGO_URL }} --no-analytics true --templates {{ template.TEMPLATES_URL }} + command: -H tcp://tasks.agent:9001 --tlsskipverify --admin-password-file /run/secrets/portainer_admin_password --logo {{ .docker.portainer.siteLogoUrl }} --no-analytics true --templates {{ .docker.portainer.templatesUrl }} expose: - 9443 ports: diff --git a/home/dot_config/docker/templates/statping.docker-stack.yml.tmpl b/home/dot_config/docker/templates/statping.docker-stack.yml.tmpl index e48378aa..99599b3d 100644 --- a/home/dot_config/docker/templates/statping.docker-stack.yml.tmpl +++ b/home/dot_config/docker/templates/statping.docker-stack.yml.tmpl @@ -23,8 +23,8 @@ services: DB_USER_FILE: /run/secrets/statping_database_user DB_PASS_FILE: /run/secrets/statping_database_password DB_DATABASE_FILE: /run/secrets/statping_database_name - NAME: "{{ template.NAME }}" - DESCRIPTION: "{{ template.DESCRIPTION }}" + NAME: "{{ .docker.statping.name }}" + DESCRIPTION: "{{ .docker.statping.description }}" deploy: mode: replicated replicas: 1