From a75878fe38136db2ee0d6c4125c316baad8b3451 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 3 Dec 2025 18:29:40 +0900
Subject: [PATCH] wip

---
 packages/backend/scripts/convert_config.js | 21 +++++++--------------
 packages/backend/src/config.ts             |  6 +-----
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/packages/backend/scripts/convert_config.js b/packages/backend/scripts/convert_config.js
index e93baa409a..92039998dd 100644
--- a/packages/backend/scripts/convert_config.js
+++ b/packages/backend/scripts/convert_config.js
@@ -17,6 +17,7 @@ const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
 
 const configDir = resolve(_dirname, '../../../.config');
+const OUTPUT_PATH = resolve(configDir, '.config.json');
 
 /**
  * YAMLファイルをJSONファイルに変換
@@ -38,22 +39,14 @@ function convertYamlToJson(ymlPath, jsonPath) {
 	console.log(`✓ ${ymlPath} → ${jsonPath}`);
 }
 
-// default.yml と test.yml を変換
-convertYamlToJson(
-	resolve(configDir, 'default.yml'),
-	resolve(configDir, 'default.json'),
-);
-
-convertYamlToJson(
-	resolve(configDir, 'test.yml'),
-	resolve(configDir, 'test.json'),
-);
-
-// MISSKEY_CONFIG_YML 環境変数が指定されている場合も変換
 if (process.env.MISSKEY_CONFIG_YML) {
 	const customYmlPath = resolve(configDir, process.env.MISSKEY_CONFIG_YML);
-	const customJsonPath = customYmlPath.replace(/\.ya?ml$/i, '.json');
-	convertYamlToJson(customYmlPath, customJsonPath);
+	convertYamlToJson(customYmlPath, OUTPUT_PATH);
+} else {
+	convertYamlToJson(
+		resolve(configDir, process.env.NODE_ENV === 'test' ? 'test.yml' : 'default.yml'),
+		OUTPUT_PATH,
+	);
 }
 
 console.log('Configuration compiled');
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 53946a0bdc..403c9a2a8a 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -225,11 +225,7 @@ const dir = `${_dirname}/../../../.config`;
 /**
  * Path of configuration file
  */
-export const path = process.env.MISSKEY_CONFIG_YML
-	? resolve(dir, process.env.MISSKEY_CONFIG_YML).replace(/\.ya?ml$/i, '.json')
-	: process.env.NODE_ENV === 'test'
-		? resolve(dir, 'test.json')
-		: resolve(dir, 'default.json');
+export const path = resolve(dir, '.config.json');
 
 export function loadConfig(): Config {
 	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));