From e9b6068f3d8c77516bf5d71420a5e71904e4000d Mon Sep 17 00:00:00 2001 From: Klagarge Date: Sat, 18 May 2024 18:38:48 +0200 Subject: [PATCH] fix whitelist --- docker-compose.yml | 55 +--------------------------------------------- mc/mc2discord.toml | 2 +- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0a88af2..e64191e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,59 +2,6 @@ version: '3' services: - traefik: - image: traefik - restart: unless-stopped - ports: - - "80:80" - - "443:443" - volumes: - #- /var/run/docker.sock:/var/run/docker.sock - - "////./pipe/docker_engine:/var/run/docker.sock" - - ./traefik.yml:/etc/traefik/traefik.yml - - ./authorized_users:/etc/traefik/authorized_users - - ./acme.json:/acme.json - labels: - - "traefik.enable=true" - - "traefik.http.routers.dashboard-http.entrypoints=http" - - "traefik.http.routers.dashboard-http.rule=Host(`localhost/`)" - - "traefik.http.routers.dashboard-http.middlewares=dashboard-redirect" - - "traefik.http.middlewares.dashboard-redirect.redirectscheme.scheme=https" - - "traefik.http.routers.dashboard-https.entrypoints=https" - - "traefik.http.routers.dashboard-https.rule=(Host(`localhost/`)) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))" - - "traefik.http.routers.dashboard-https.tls.certResolver=letsencrypt" - - "traefik.http.routers.dashboard-https.service=api@internal" - - "traefik.http.routers.dashboard-https.middlewares=dashboard-auth" - - "traefik.http.middlewares.dashboard-auth.basicauth.usersfile=/etc/traefik/authorized_users" - command: - # Enable Docker in Traefik, so that it reads labels from Docker services - - --providers.docker - # Add a constraint to only use services with the label "traefik.constraint-label=traefik-public" - #- --providers.docker.constraints=Label(`traefik.constraint-label`, `traefik-public`) - # Do not expose all Docker services, only the ones explicitly exposed - #- --providers.docker.exposedbydefault=false - # Enable Docker Swarm mode - - --providers.docker.swarmmode - # Create an entrypoint "http" listening on port 80 - - --entrypoints.http.address=:80 - # Create an entrypoint "https" listening on port 443 - - --entrypoints.https.address=:443 - # Create the certificate resolver "le" for Let's Encrypt, uses the environment variable EMAIL - #- --certificatesresolvers.le.acme.email='cboivin@secure-exchanges.com'#$EMAIL - # Store the Let's Encrypt certificates in the mounted volume - #- --certificatesresolvers.le.acme.storage=/certificates/acme.json - # Use the TLS Challenge for Let's Encrypt - #- --certificatesresolvers.le.acme.tlschallenge=true - # Enable the access log, with HTTP requests - - --accesslog - # Enable the Traefik log, for configurations and errors - - --log - # Enable the Dashboard and API - - --api.insecure=true - - # Docker engine - - --providers.docker.endpoint=npipe:////./pipe/docker_engine - minecraft: image: itzg/minecraft-server restart: "unless-stopped" @@ -63,7 +10,7 @@ services: - ./mc/data:/data - ./mc/mods:/mods:ro - ./mc/icon.png:/icon.png - - ./mc/whitelist.json:/whitelist.json + - ./mc/whitelist.json:/whitelist.json:ro #- ./mc/mc2discord.toml:/data/config/mc2discord.toml depends_on: - lazytainer diff --git a/mc/mc2discord.toml b/mc/mc2discord.toml index a6d2de8..9040fcb 100644 --- a/mc/mc2discord.toml +++ b/mc/mc2discord.toml @@ -62,7 +62,7 @@ lang = "en_us" # Minecraft permission level that will be allowed, all commands up to that level will be available (-1 <=> No commands, 0 <=> all non-op commands, 3 <=> all op commands) permission_level = -1 # List of commands that will be allowed in addition of the permission level - commands = ["time set", "weather clear"] + commands = ["weather clear"] # Enable additional features # Executing "/mc2discord restart" is required to generate feature-related parts of the configuration file