From 62a6da034dc6f16eb8078010c09188f4d218029e Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 17:24:56 +0900
Subject: [PATCH 01/14] Create Dockerfile

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..cbb6ae3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM ghcr.io/toro-server/toro-configs-enforcer:latest
+
+WORKDIR /app
+
+COPY /main /app/main

From 62364264199ce8a42cceeb945bfb09043bf483c7 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 17:25:40 +0900
Subject: [PATCH 02/14] Create update.sh

---
 update.sh | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 update.sh

diff --git a/update.sh b/update.sh
new file mode 100644
index 0000000..98f5f04
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd $(dirname $0)
+
+docker run --rm -it $(docker build -t toro-configs)

From 96e94d3f31ed3f6ff7a24d2da22821e208a9af37 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 20:37:47 +0900
Subject: [PATCH 03/14] Update .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4a73b67..92f7ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+
 # すべてのファイルとディレクトリを無視
 *
 # ".pub" を含むファイルを 無視対象から除外
@@ -9,3 +10,5 @@
 !/*
 
 !.github/**
+
+docker-compose.yml

From 2706af95316bf5cb834a31632aab970d823d139a Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 20:37:55 +0900
Subject: [PATCH 04/14] Delete secrets.json

---
 secrets.json | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 secrets.json

diff --git a/secrets.json b/secrets.json
deleted file mode 100644
index a16c987..0000000
--- a/secrets.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    "ADDPERM:DISCORD_WEBHOOK",
-    "BANPLAYERSHEET:API_URL",
-    "BUNGEEGUARD:ALLOWED_TOKENS",
-    "DISCORDSRV:BOT_TOKEN",
-    "DISCORDSRV:CHANNELS",
-    "DISCORDSRV:CONSOLE_CHANNEL_ID",
-    "TPSLOG:DISCORD_WEBHOOK"
-]
\ No newline at end of file

From a575fe49cd55211fcfd31bf4f1722280a1146058 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 20:38:07 +0900
Subject: [PATCH 05/14] Create docker-compose.example.yml

---
 docker-compose.example.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 docker-compose.example.yml

diff --git a/docker-compose.example.yml b/docker-compose.example.yml
new file mode 100644
index 0000000..35a3efa
--- /dev/null
+++ b/docker-compose.example.yml
@@ -0,0 +1,6 @@
+services:
+  main:
+    image: ghcr.io/toro-server/toro-configs-enforcer:latest
+    container_name: toro-configs-main
+    volumes:
+      - ./main:/app/main

From a4fa3a8110760571a7f895d823f524cb6af96aba Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Sun, 20 Jul 2025 20:55:43 +0900
Subject: [PATCH 06/14] Update docker-compose.example.yml

---
 docker-compose.example.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index 35a3efa..adc87a2 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -2,5 +2,7 @@ services:
   main:
     image: ghcr.io/toro-server/toro-configs-enforcer:latest
     container_name: toro-configs-main
+    env_file:
+      - .env
     volumes:
       - ./main:/app/main

From acb5f4ca9787932e587740071415c721fe8154c0 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:49:14 +0900
Subject: [PATCH 07/14] Delete docker-compose.example.yml

---
 docker-compose.example.yml | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 docker-compose.example.yml

diff --git a/docker-compose.example.yml b/docker-compose.example.yml
deleted file mode 100644
index adc87a2..0000000
--- a/docker-compose.example.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-services:
-  main:
-    image: ghcr.io/toro-server/toro-configs-enforcer:latest
-    container_name: toro-configs-main
-    env_file:
-      - .env
-    volumes:
-      - ./main:/app/main

From 1209eade554053a5c4b69cdeca445e87f03e1b62 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:49:40 +0900
Subject: [PATCH 08/14] Update .gitignore

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92f7ccf..7540e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,3 @@
 !/*
 
 !.github/**
-
-docker-compose.yml

From 4a5837f38363cf09b5c89a184ab071ae00738aeb Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:49:47 +0900
Subject: [PATCH 09/14] Create docker-compose.yml

---
 docker-compose.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..adc87a2
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,8 @@
+services:
+  main:
+    image: ghcr.io/toro-server/toro-configs-enforcer:latest
+    container_name: toro-configs-main
+    env_file:
+      - .env
+    volumes:
+      - ./main:/app/main

From 1c90718522284849be8ad7f72219fe8627158341 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:07:15 +0900
Subject: [PATCH 10/14] : to _

---
 main/plugins/AddPerm/config.pub.yml        | 2 +-
 main/plugins/BanPlayerSheet/config.pub.yml | 2 +-
 main/plugins/BungeeGuard/config.pub.yml    | 2 +-
 main/plugins/DiscordSRV/config.pub.yml     | 6 +++---
 main/plugins/Tps_log/config.pub.yml        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/plugins/AddPerm/config.pub.yml b/main/plugins/AddPerm/config.pub.yml
index d23b427..e59a86b 100644
--- a/main/plugins/AddPerm/config.pub.yml
+++ b/main/plugins/AddPerm/config.pub.yml
@@ -1 +1 @@
-webhook-url: "[[ADDPERM:DISCORD_WEBHOOK]]"
+webhook-url: "[[ADDPERM_DISCORD_WEBHOOK]]"
diff --git a/main/plugins/BanPlayerSheet/config.pub.yml b/main/plugins/BanPlayerSheet/config.pub.yml
index c8b75af..3bcd936 100644
--- a/main/plugins/BanPlayerSheet/config.pub.yml
+++ b/main/plugins/BanPlayerSheet/config.pub.yml
@@ -1,4 +1,4 @@
-URL: "[[BANPLAYERSHEET:API_URL]]"
+URL: "[[BANPLAYERSHEET_API_URL]]"
 
 Message:
   BanReason: "BAN 理由"
diff --git a/main/plugins/BungeeGuard/config.pub.yml b/main/plugins/BungeeGuard/config.pub.yml
index b3dfce8..d9a13dd 100644
--- a/main/plugins/BungeeGuard/config.pub.yml
+++ b/main/plugins/BungeeGuard/config.pub.yml
@@ -2,7 +2,7 @@
 
 # Allowed authentication tokens.
 allowed-tokens:
-  - "[[BUNGEEGUARD:ALLOWED_TOKENS]]"
+  - "[[BUNGEEGUARD_ALLOWED_TOKENS]]"
 
 
 # Messages
diff --git a/main/plugins/DiscordSRV/config.pub.yml b/main/plugins/DiscordSRV/config.pub.yml
index 32600e1..53592ee 100644
--- a/main/plugins/DiscordSRV/config.pub.yml
+++ b/main/plugins/DiscordSRV/config.pub.yml
@@ -6,7 +6,7 @@ ConfigVersion: 1.27.0
 
 # Bot token; don't know what this is? Look at the video on the plugin page for instructions
 # You must restart your server after changing this option
-BotToken: "[[DISCORDSRV:BOT_TOKEN]]"
+BotToken: "[[DISCORDSRV_BOT_TOKEN]]"
 
 # Channel links from game to Discord
 # syntax is Channels: {"in-game channel name from Minecraft": "numerical channel ID from Discord", "another in-game channel name from Minecraft": "another numerical channel ID from Discord"}
@@ -27,10 +27,10 @@ BotToken: "[[DISCORDSRV:BOT_TOKEN]]"
 #
 # The first part of channel pairs is not the Discord channel name!
 # Run "/discord reload" after changing this option to apply
-Channels: [[DISCORDSRV:CHANNELS]]
+Channels: [[DISCORDSRV_CHANNELS]]
 
 # Console channel numerical ID (NOT NAME), leave blank to disable the console channel all together
-DiscordConsoleChannelId: "[[DISCORDSRV:CONSOLE_CHANNEL_ID]]"
+DiscordConsoleChannelId: "[[DISCORDSRV_CONSOLE_CHANNEL_ID]]"
 
 # Invitation link shown to players when using /discord and on the message shown to unlinked players when linking is enforced
 DiscordInviteLink: "https://discord.gg/changethisintheconfig.yml"
diff --git a/main/plugins/Tps_log/config.pub.yml b/main/plugins/Tps_log/config.pub.yml
index 77ab669..d5c97f8 100644
--- a/main/plugins/Tps_log/config.pub.yml
+++ b/main/plugins/Tps_log/config.pub.yml
@@ -17,7 +17,7 @@ MaxTPS: 20
 WarnTPS: 18
 
 #Discord Webhook
-WebhookURL: "[[TPSLOG:DISCORD_WEBHOOK]]"
+WebhookURL: "[[TPSLOG_DISCORD_WEBHOOK]]"
 #Discord Embed Color
 EmbedColor: 12915218
 Discord: true

From e1dc30ff4522f2355b99b81bf4d8c40e4461667e Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:22:31 +0900
Subject: [PATCH 11/14] Update config.pub.yml

---
 main/plugins/DiscordSRV/config.pub.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/plugins/DiscordSRV/config.pub.yml b/main/plugins/DiscordSRV/config.pub.yml
index 53592ee..471ba7e 100644
--- a/main/plugins/DiscordSRV/config.pub.yml
+++ b/main/plugins/DiscordSRV/config.pub.yml
@@ -27,7 +27,7 @@ BotToken: "[[DISCORDSRV_BOT_TOKEN]]"
 #
 # The first part of channel pairs is not the Discord channel name!
 # Run "/discord reload" after changing this option to apply
-Channels: [[DISCORDSRV_CHANNELS]]
+Channels: {"global": "[[DISCORDSRV_CHANNELS]]"}
 
 # Console channel numerical ID (NOT NAME), leave blank to disable the console channel all together
 DiscordConsoleChannelId: "[[DISCORDSRV_CONSOLE_CHANNEL_ID]]"

From 85ba4e4c5f5eb7977edbefed296217409bdd4ae9 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:24:30 +0900
Subject: [PATCH 12/14] Update update.sh

---
 update.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 98f5f04..201f682 100644
--- a/update.sh
+++ b/update.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 cd $(dirname $0)
 
-docker run --rm -it $(docker build -t toro-configs)
+git fetch origin main
+git reset --hard origin/main
+
+docker compose pull
+docker compose up
+docker compose down

From 5ac385e835bea63be17a1a641aa223f8705bb1a9 Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:24:58 +0900
Subject: [PATCH 13/14] Update .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7540e0b..426ee70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 !/*
 
 !.github/**
+
+.env
\ No newline at end of file

From 052cd77283b30b6abde069f975ff1676b0d7bb2f Mon Sep 17 00:00:00 2001
From: malken21 <77374813+malken21@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:25:08 +0900
Subject: [PATCH 14/14] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 426ee70..b8b7638 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@
 
 !.github/**
 
-.env
\ No newline at end of file
+.env