usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2025-12-04 15:57:05 +09:00
parent 4b14265ec2
commit fd78e097c6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/scripts/compile_config.js
View File

@ -17,7 +17,7 @@ const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename);
const configDir = resolve(_dirname, '../../../.config');
const OUTPUT_PATH = resolve(_dirname, '../../../built/.config.json');
const OUTPUT_PATH = resolve(_dirname, '../../../.config/.config.json');
// TODO: yamlのパースに失敗したときのエラーハンドリング
@ -27,8 +27,8 @@ const OUTPUT_PATH = resolve(_dirname, '../../../built/.config.json');
*/
function yamlToJson(ymlPath) {
if (!fs.existsSync(ymlPath)) {
console.error(`YAML file not found: ${ymlPath}`);
process.exit(1);
console.log(`YAML file not found: ${ymlPath}`);
return;
}
console.log(`${ymlPath} → ${OUTPUT_PATH}`);

4
packages/backend/src/config.ts
View File

@ -217,9 +217,9 @@ export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch';
const _filename = fileURLToPath(import.meta.url);
const _dirname = dirname(_filename);
const compiledConfigFilePathForTest = resolve(_dirname, '../../../built/._config_.json');
const compiledConfigFilePathForTest = resolve(_dirname, '../../../.config/._config_.json');
export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../built/.config.json');
export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../.config/.config.json');
export function loadConfig(): Config {
if (!fs.existsSync(compiledConfigFilePath)) {

2
packages/backend/test-federation/compose.a.yml
View File

@ -38,7 +38,7 @@ services:
volumes:
- type: bind
source: ./.config/a.test.config.json
target: /misskey/built/._config_.json
target: /misskey/.config/._config_.json
read_only: true
db.a.test:

2
packages/backend/test-federation/compose.b.yml
View File

@ -38,7 +38,7 @@ services:
volumes:
- type: bind
source: ./.config/b.test.config.json
target: /misskey/built/._config_.json
target: /misskey/.config/._config_.json
read_only: true
db.b.test: