From ca77ef11aa3e19001c9ad13b7cd54f8ef44ad59c Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Thu, 30 Mar 2023 19:08:10 +0300 Subject: [PATCH] [#192] config: Rename `.yaml` to `.yml` Make them consistent across all our repos. Signed-off-by: Evgenii Stratonikov --- CHANGELOG.md | 2 +- config/example/README.md | 8 ++++---- config/example/{cli.yaml => cli.yml} | 0 config/example/{ir-control.yaml => ir-control.yml} | 0 config/example/{node-control.yaml => node-control.yml} | 0 config/example/{node.yaml => node.yml} | 0 debian/rules | 6 +++--- 7 files changed, 8 insertions(+), 8 deletions(-) rename config/example/{cli.yaml => cli.yml} (100%) rename config/example/{ir-control.yaml => ir-control.yml} (100%) rename config/example/{node-control.yaml => node-control.yml} (100%) rename config/example/{node.yaml => node.yml} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc2f4adad..a55143c6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -861,7 +861,7 @@ with `NEOFS_IR_FEE_NAMED_CONTAINER_REGISTER`. ### Upgrading from v0.26.0 You can specify default section in storage engine configuration. -See [example](./config/example/node.yaml) for more details. +See [example](./config/example/node.yml) for more details. ## [0.26.0] - 2021-10-19 - Udo (우도, 牛島) diff --git a/config/example/README.md b/config/example/README.md index 8dd0fe44a..b958766bf 100644 --- a/config/example/README.md +++ b/config/example/README.md @@ -1,7 +1,7 @@ # Examples of correct configuration file structures Here are files in all supported formats and with all possible configuration values -of FrostFS applications. See [node.yaml](node.yaml) for configuration notes. +of FrostFS applications. See [node.yml](node.yml) for configuration notes. All parameters are correct, however, they are for informational purposes only. It is not recommended transferring these configs for real application launches. @@ -10,11 +10,11 @@ It is not recommended transferring these configs for real application launches. - Storage node - JSON: `node.json` - - YAML: `node.yaml` + - YAML: `node.yml` - Inner ring - YAML: `ir.yaml` - CLI - - YAML: `cli.yaml` + - YAML: `cli.yml` ### Multiple configs @@ -23,7 +23,7 @@ For example, you can use separate yaml file for each shard or each service (ppro You must use `--config-dir` flag to process several configs: ```shell -$ ./bin/frotsfs-node --config ./config/example/node.yaml --config-dir ./dir/with/additional/configs +$ ./bin/frotsfs-node --config ./config/example/node.yml --config-dir ./dir/with/additional/configs ``` When the `--config-dir` flag set, the application: diff --git a/config/example/cli.yaml b/config/example/cli.yml similarity index 100% rename from config/example/cli.yaml rename to config/example/cli.yml diff --git a/config/example/ir-control.yaml b/config/example/ir-control.yml similarity index 100% rename from config/example/ir-control.yaml rename to config/example/ir-control.yml diff --git a/config/example/node-control.yaml b/config/example/node-control.yml similarity index 100% rename from config/example/node-control.yaml rename to config/example/node-control.yml diff --git a/config/example/node.yaml b/config/example/node.yml similarity index 100% rename from config/example/node.yaml rename to config/example/node.yml diff --git a/debian/rules b/debian/rules index b85356b99..148e8fce3 100755 --- a/debian/rules +++ b/debian/rules @@ -25,9 +25,9 @@ override_dh_auto_install: bin/frostfs-cli completion zsh > debian/frostfs-cli/usr/share/zsh/vendor-completions/_frostfs-cli install -T -m 0640 config/example/ir.yaml debian/frostfs-ir/etc/frostfs/ir/config.yml - install -T -m 0640 config/example/ir-control.yaml debian/frostfs-ir/etc/frostfs/ir/control.yml - install -T -m 0640 config/example/node.yaml debian/frostfs-storage/etc/frostfs/storage/config.yml - install -T -m 0640 config/example/node-control.yaml debian/frostfs-storage/etc/frostfs/storage/control.yml + install -T -m 0640 config/example/ir-control.yml debian/frostfs-ir/etc/frostfs/ir/control.yml + install -T -m 0640 config/example/node.yml debian/frostfs-storage/etc/frostfs/storage/config.yml + install -T -m 0640 config/example/node-control.yml debian/frostfs-storage/etc/frostfs/storage/control.yml override_dh_installsystemd: dh_installsystemd --no-enable --no-start --name=frostfs-ir -- 2.45.2