diff --git a/dms/docker-compose.yaml b/dms/docker-compose.yaml index 8ab1cbd..4728e06 100644 --- a/dms/docker-compose.yaml +++ b/dms/docker-compose.yaml @@ -12,7 +12,7 @@ services: image: ghcr.io/docker-mailserver/docker-mailserver:latest container_name: "mailserver" # Provide the FQDN of your mail server here (Your DNS MX record should point to this value) - hostname: oxmox.root.sx + hostname: oxmox.dev env_file: mailserver.env # More information about the mail-server ports: # https://docker-mailserver.github.io/docker-mailserver/latest/config/security/understanding-the-ports/ diff --git a/dms/mailserver.env b/dms/mailserver.env index c57de2a..456109a 100644 --- a/dms/mailserver.env +++ b/dms/mailserver.env @@ -217,7 +217,7 @@ SMTP_ONLY= # manual => Let's you manually specify locations of your SSL certificates for non-standard cases # self-signed => Enables self-signed certificates SSL_TYPE=letsencrypt -SSL_DOMAIN=oxmox.root.sx +SSL_DOMAIN=oxmox.dev # These are only supported with `SSL_TYPE=manual`. # Provide the path to your cert and key files that you've mounted access to within the container. diff --git a/docker-compose.yml b/docker-compose.yml index c6fafe8..e5eaa18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,9 @@ x-logging: &logging driver: loki options: loki-url: "http://localhost:3100/loki/api/v1/push" + mode: "non-blocking" + max-buffer-size: "32m" + loki-retries: "3" services: traefik: @@ -52,9 +55,9 @@ services: - /etc/localtime:/etc/localtime:ro labels: - "traefik.enable=true" - # Make the traefik dashboard available under https://oxmox.root.sx/traefik/dashboard/ + # Make the traefik dashboard available under https://oxmox.dev/traefik/dashboard/ # For some reason it's slow when used this way. It's fast when exposed via port 8080 and api.insecure=true. - - "traefik.http.routers.traefik_api.rule=Host(`oxmox.root.sx`) && (PathPrefix(`/api`) || PathPrefix(`/traefik`))" + - "traefik.http.routers.traefik_api.rule=Host(`oxmox.dev`) && (PathPrefix(`/api`) || PathPrefix(`/traefik`))" - "traefik.http.routers.traefik_api.entrypoints=websecure" - "traefik.http.routers.traefik_api.tls.certresolver=myresolver" - "traefik.http.routers.traefik_api.service=api@internal" @@ -67,7 +70,7 @@ services: container_name: "simple-service" labels: - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`oxmox.root.sx`) && Path(`/whoami`)" + - "traefik.http.routers.whoami.rule=Host(`oxmox.dev`) && Path(`/whoami`)" - "traefik.http.routers.whoami.entrypoints=websecure" - "traefik.http.routers.whoami.tls.certresolver=myresolver" @@ -143,13 +146,13 @@ services: - nextcloud_admin_password labels: - "traefik.enable=true" - - "traefik.http.routers.nextcloud_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/nextcloud`)" + - "traefik.http.routers.nextcloud_app.rule=Host(`oxmox.dev`) && PathPrefix(`/nextcloud`)" - "traefik.http.routers.nextcloud_app.entrypoints=websecure" - "traefik.http.routers.nextcloud_app.tls.certresolver=myresolver" - "traefik.http.routers.nextcloud_app.middlewares=nextcloud_app_strip" - "traefik.http.middlewares.nextcloud_app_strip.stripprefix.prefixes=/nextcloud" - - "traefik.http.routers.nextcloud_dav.rule=Host(`oxmox.root.sx`) && PathPrefix(`/.well-known/`)" + - "traefik.http.routers.nextcloud_dav.rule=Host(`oxmox.dev`) && PathPrefix(`/.well-known/`)" - "traefik.http.routers.nextcloud_dav.entrypoints=websecure" - "traefik.http.routers.nextcloud_dav.tls.certresolver=myresolver" - "traefik.http.routers.nextcloud_dav.middlewares=nextcloud_app_dav" @@ -215,7 +218,7 @@ services: - FORGEJO__database__PASSWD=forgejo1234 labels: - "traefik.enable=true" - - "traefik.http.routers.forgejo_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/forge`)" + - "traefik.http.routers.forgejo_app.rule=Host(`oxmox.dev`) && PathPrefix(`/forge`)" - "traefik.http.routers.forgejo_app.entrypoints=websecure" - "traefik.http.routers.forgejo_app.tls.certresolver=myresolver" - "traefik.http.routers.forgejo_app.middlewares=forgejo_app_strip" @@ -240,7 +243,7 @@ services: - PGID=1000 labels: - "traefik.enable=true" - - "traefik.http.routers.prometheus_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/prometheus`)" + - "traefik.http.routers.prometheus_app.rule=Host(`oxmox.dev`) && PathPrefix(`/prometheus`)" - "traefik.http.routers.prometheus_app.entrypoints=websecure" - "traefik.http.routers.prometheus_app.tls.certresolver=myresolver" - "traefik.http.routers.prometheus_app.middlewares=traefik_api_auth" @@ -265,7 +268,7 @@ services: - GF_INSTALL_PLUGINS=grafana-piechart-panel labels: - "traefik.enable=true" - - "traefik.http.routers.grafana_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/grafana`)" + - "traefik.http.routers.grafana_app.rule=Host(`oxmox.dev`) && PathPrefix(`/grafana`)" - "traefik.http.routers.grafana_app.entrypoints=websecure" - "traefik.http.routers.grafana_app.tls.certresolver=myresolver" - "traefik.http.routers.grafana_app.middlewares=traefik_api_auth,grafana_app_strip" @@ -311,7 +314,7 @@ services: - "127.0.0.1:3100:3100" labels: - "traefik.enable=true" - - "traefik.http.routers.loki_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/loki`)" + - "traefik.http.routers.loki_app.rule=Host(`oxmox.dev`) && PathPrefix(`/loki`)" - "traefik.http.routers.loki_app.entrypoints=websecure" - "traefik.http.routers.loki_app.tls.certresolver=myresolver" - "traefik.http.routers.loki_app.middlewares=traefik_api_auth,loki_app_strip" @@ -347,7 +350,7 @@ services: # environment: # - PUID=1000 # - PGID=1000 - # #- SERVERURL=wireguard.oxmox.root.sx #optional + # #- SERVERURL=wireguard.oxmox.dev #optional # - SERVERPORT=51820 #optional # - PEERS=1 #optional # - PEERDNS=auto #optional diff --git a/grafana/etc/grafana.ini b/grafana/etc/grafana.ini index fc2d031..154db6c 100644 --- a/grafana/etc/grafana.ini +++ b/grafana/etc/grafana.ini @@ -2,10 +2,10 @@ app_mode = production # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty -instance_name = oxmox.root.sx +instance_name = oxmox.dev [server] -root_url = https://oxmox.root.sx/grafana +root_url = https://oxmox.dev/grafana [auth] # Disable usage of Grafana build-in login solution.