updating monitoring-ng to latest main version so secret length doesnt bone us

Reviewed-on: #21

abra/servers/laylotta.resisttechmonopolies.online/listmonk.resisttechmonopolies.online.env

@@ -0,0 +1,6 @@
+TYPE=listmonk:5.1.0+v6.1.0
+
+DOMAIN=listmonk.resisttechmonopolies.online
+LETS_ENCRYPT_ENV=production
+
+SECRET_DB_PASSWORD_VERSION=v1

abra/servers/laylotta.resisttechmonopolies.online/m.laylotta.resisttechmonopolies.online.env

@@ -1,4 +1,4 @@
-TYPE=monitoring-ng:23b13cb8
+TYPE=monitoring-ng:main
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE=compose.yml
 DOMAIN=m.laylotta.resisttechmonopolies.online
@@ -6,14 +6,15 @@ TIMEOUT=120
 ENABLE_BACKUPS=true
 
 ## Enable this secret for Promtail / Prometheus
+COMPOSE_FILE="$COMPOSE_FILE:compose.basic-auth.yml"
 SECRET_BASIC_AUTH_VERSION=v1
 
 ## Promtail (Gathering Logs)
-COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml"
-LOKI_PUSH_URL=https://loki.${DOMAIN}/loki/api/v1/push
+#COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml"
+#LOKI_PUSH_URL=https://loki.${DOMAIN}/loki/api/v1/push
 
 ## Expose node and cadvisor ports instead of traefik
-COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.expose-ports.yml"
 
 # Monitoring Server
 #
@@ -26,7 +27,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.pushgateway.yml"
 
 ## Loki
 # Loki Server
-COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.loki.yml"
 
 # Set to 0 to disable retention
 LOKI_RETENTION_PERIOD=744h
@@ -39,39 +40,40 @@ LOKI_STORAGE_FILESYSTEM=1
 # LOKI_ACCESS_KEY_ID=bush-debrief-approval-robust-scraggly-molecule
 # LOKI_BUCKET_NAMES=loki
 # SECRET_LOKI_AWS_SECRET_ACCESS_KEY_VERSION=v1
-#
+
 ## Grafana
-#
-# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
-# GF_SERVER_ROOT_URL=https://monitoring.example.com
-# SECRET_GRAFANA_ADMIN_PASSWORD_VERSION=v1
+COMPOSE_FILE="$COMPOSE_FILE:compose.grafana.yml"
+GF_SERVER_ROOT_URL=https://monitoring.${DOMAIN}
+SECRET_GF_ADMINPASSWD_VERSION=v1
 ## Seperate domain for Grafana
-#GRAFANA_DOMAIN=grafana.example.com
-#
+GRAFANA_DOMAIN=grafana.${DOMAIN}
+
 ## Single-Sign-On with OIDC
-# OIDC_ENABLED=1
-# SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION=v1
-# OIDC_CLIENT_ID=grafana
-# OIDC_AUTH_URL="https://authentik.example.com/application/o/authorize/"
-# OIDC_API_URL="https://authentik.example.com/application/o/userinfo/"
-# OIDC_TOKEN_URL="https://authentik.example.com/application/o/token/"
-#
+COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
+OIDC_ENABLED=1
+SECRET_GF_OIDC_SECRET_VERSION=v1
+OIDC_CLIENT_ID=grafana
+OIDC_AUTH_URL="https://auth.resisttechmonopolies.online/application/o/authorize/"
+OIDC_API_URL="https://auth.resisttechmonopolies.online/application/o/userinfo/"
+OIDC_TOKEN_URL="https://auth.resisttechmonopolies.online/application/o/token/"
+
 ## Additional grafana settings (unlikely to require editing)
 # GF_SECURITY_ALLOW_EMBEDDING=1
 # GF_INSTALL_PLUGINS=grafana-piechart-panel
 #
 ## grafana SMTP configuration (optional)
+# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-smtp.yml"
 # GF_SMTP_HOST=changeme
 # GF_SMTP_USER=changme
 # GF_SMTP_ENABLED=true
 # GF_SMTP_FROM_ADDRESS=grafana@example.com
 # GF_SMTP_SKIP_VERIFY=false
-# SECRET_GRAFANA_SMTP_PASSWORD_VERSION=v1
+SECRET_GF_SMTP_PASSWORD_VERSION=v1
 #
 
 ## Grafana Matrix Contact Point (optional)
 #COMPOSE_FILE="$COMPOSE_FILE:compose.matrix-alertmanager-receiver.yml"
-#SECRET_MATRIX_ACCESS_TOKEN_VERSION=v1
+#SECRET_MATRIX_TOKEN_VERSION=v1
 #GF_MATRIX_USER_ID="<user-id>"
 #GF_MATRIX_ROOM_ID="<room-id>"
 #GF_MATRIX_HOMESERVER_URL="<homeserver-url>"
@@ -81,4 +83,9 @@ LOKI_STORAGE_FILESYSTEM=1
 #ALERT_BACKUP_MISSING_ENABLED=true
 #ALERT_BACKUP_NOT_SUCCESSFULL_ENABLED=true
 #ALERT_NODE_DISK_SPACE_ENABLED=true
-#ALERT_NODE_MEMORY_USAGE_ENABLED=true
+#ALERT_NODE_MEMORY_USAGE_ENABLED=true
+# Node disk space alert will trigger when free disk space left is below the given number in percent
+#ALERT_NODE_DISK_SPACE_LEFT=10
+
+# Node memory usage alert will trigger when memory usage is above the given number in percent
+#ALERT_NODE_MEMORY_USAGE=85

abra/servers/laylotta.resisttechmonopolies.online/resisttechmonopolies.online.env

@@ -7,4 +7,4 @@ DOMAIN=resisttechmonopolies.online
 EXTRA_DOMAINS=", `www.resisttechmonopolies.online`"
 
 LETS_ENCRYPT_ENV=production
-VERSION=0.0.21
+VERSION=0.0.26

abra/servers/sootie.resisttechmonopolies.online/testio.sootie.resisttechmonopolies.online.env

@@ -1,106 +0,0 @@
-TYPE=loomio:5.2.0+v3.0.20
-COMPOSE_FILE="compose.yml"
-
-DOMAIN=testio.sootie.resisttechmonopolies.online
-## Domain aliases
-#EXTRA_DOMAINS=', `www.testio.resisttechmonopolies.online`'
-LETS_ENCRYPT_ENV=production
-
-# mail setup
-COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
-SUPPORT_EMAIL=noreply@example.com
-SMTP_AUTH=plain
-SMTP_DOMAIN=example.com
-SMTP_SERVER=example.com
-SMTP_PORT=587
-SMTP_USERNAME=noreply@example.com
-SMTP_USE_SSL=1
-# to disable SSL comment out line rather than changing to 0
-SECRET_SMTP_PASSWORD_VERSION=v1
-
-# From field for notification e-mails
-NOTIFICATIONS_EMAIL_ADDRESS=noreply@example.com
-
-# reply-to in email notifications
-REPLY_HOSTNAME=$DOMAIN
-
-RAILS_ENV=production
-
-# Number of webserver processes and threads
-# threads are per worker. See https://github.com/puma/puma
-PUMA_WORKERS=2
-MIN_THREADS=12
-MAX_THREADS=12
-
-# Force all connections to be https
-FORCE_SSL=1
-
-# Enable rate limiting on group creation, other POST actions
-USE_RACK_ATTACK=1
-
-SECRET_DEVISE_SECRET_VERSION=v1 #length=64
-SECRET_SECRET_COOKIE_TOKEN_VERSION=v1 #length=64
-SECRET_DB_PASSWORD_VERSION=v1
-
-# Send catch up email (missed yesterday) weekly
-# EMAIL_CATCH_UP_WEEKLY=1
-
-# TODO 3wc: settings from here on aren't yet included in compose.yml
-
-# subscribe on participation default for new users
-# uncomment this to change "subscribe on participation" to be false for new users
-# EMAIL_ON_PARTICIPATION_DEFAULT_FALSE=1
-
-# Uncomment these to disable features
-# FEATURES_DISABLE_CREATE_USER=1     # users must be invited
-# FEATURES_DISABLE_CREATE_GROUP=1    # users cannot create groups
-# FEATURES_DISABLE_PUBLIC_GROUPS=1   # disable /explore
-# FEATURES_DISABLE_HELP_LINK=1       # disable the help link
-# MAX_PENDING_INVITATIONS=100        # maximum unaccepted invitations a group have have
-
-# Enable search engines to index public content
-# ALLOW_ROBOTS=1
-
-# Uncomment to enable SAML SSO
-# SAML_APP_KEY=1 # just a flag, keep value as 1
-# SAML_IDP_METADATA_URL=https://saml-metadata-url-provided-by-your-SSO-provider.com/12356
-#
-# Disable login via email (usually when you have enabled SSO of some kind)
-# FEATURES_DISABLE_EMAIL_LOGIN=1
-
-# oauth providers, to let your users login using external accounts
-# FACEBOOK_APP_KEY=REPLACE
-# FACEBOOK_APP_SECRET=REPLACE
-# TWITTER_APP_KEY=REPLACE
-# TWITTER_APP_SECRET=REPLACE
-# GOOGLE_APP_KEY=REPLACE
-# GOOGLE_APP_SECRET=REPLACE
-# SLACK_APP_KEY
-# SLACK_APP_SECRET
-
-# Theme images
-# images should be a multiple of 32px tall.
-# THEME_ICON_SRC=/files/icon.png
-# THEME_APP_LOGO_SRC=/files/logo.svg
-# THEME_EMAIL_HEADER_LOGO_SRC=/files/logo_128h.png
-# THEME_EMAIL_FOOTER_LOGO_SRC=/files/logo_64h.png
-
-# used in emails. use rgb or hsl values, not hex
-# THEME_PRIMARY_COLOR=rgb(255,167,38)
-# THEME_ACCENT_COLOR=rgb(0,188,212)
-# THEME_TEXT_ON_PRIMARY_COLOR=rgb(255,255,255)
-# THEME_TEXT_ON_ACCENT_COLOR=rgb(255,255,255)
-
-# env variables needed to enable OAuth2 authentication  
-COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
-OAUTH_ENABLED=1
-OAUTH_AUTH_URL="https://auth.resisttechmonopolies.online/application/o/authorize/"
-OAUTH_TOKEN_URL="https://auth.resisttechmonopolies.online/application/o/token/"
-OAUTH_PROFILE_URL="https://auth.resisttechmonopolies.online/application/o/userinfo/"
-OAUTH_SCOPE="openid email profile"
-OAUTH_APP_KEY="xNSKMmqA47TSgr7qKgzISV03reTnEmpqc0DZWmCa"
-OAUTH_ATTR_UID=email
-OAUTH_ATTR_NAME=name
-OAUTH_ATTR_EMAIL=email
-OAUTH_LOGIN_PROVIDER_NAME="loomio SSO"
-SECRET_OAUTH_APP_SECRET_VERSION=v1