diff options
| author | PradeepKiruvale <pradeepkumar.kj@softwareag.com> | 2022-07-01 11:51:18 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-01 11:51:18 +0530 |
| commit | f0d228f9109a45ff84c2dfa3642d49484550c043 (patch) | |
| tree | efc91058a271c74bcc67aeb3613d16dd359f0404 | |
| parent | ddd2f09972f1c67ee562a3ccf5c22c92890b4eaa (diff) | |
.toml format for c8y-log-plugin and c8y-configuration-plugin is different (#1223)
* Change the toml file style
Signed-off-by: Pradeep Kumar K J <pradeepkumar.kj@softwareag.com>
| -rw-r--r-- | plugins/c8y_configuration_plugin/src/main.rs | 15 | ||||
| -rw-r--r-- | plugins/c8y_log_plugin/src/main.rs | 13 |
2 files changed, 15 insertions, 13 deletions
diff --git a/plugins/c8y_configuration_plugin/src/main.rs b/plugins/c8y_configuration_plugin/src/main.rs index 45128f85..173ebd3c 100644 --- a/plugins/c8y_configuration_plugin/src/main.rs +++ b/plugins/c8y_configuration_plugin/src/main.rs @@ -213,13 +213,14 @@ fn init(cfg_dir: PathBuf) -> Result<(), anyhow::Error> { fn create_operation_files(config_dir: &str) -> Result<(), anyhow::Error> { create_directory_with_user_group(&format!("{config_dir}/c8y"), "root", "root", 0o1777)?; let example_config = r#"# Add the configurations to be managed by c8y-configuration-plugin - files = [ - # { path = '/etc/tedge/tedge.toml' }, - # { path = '/etc/tedge/mosquitto-conf/c8y-bridge.conf', type = 'c8y-bridge.conf' }, - # { path = '/etc/tedge/mosquitto-conf/tedge-mosquitto.conf', type = 'tedge-mosquitto.conf' }, - # { path = '/etc/mosquitto/mosquitto.conf', type = 'mosquitto.conf' }, - # { path = '/etc/tedge/c8y/example.txt', type = 'example', user = 'tedge', group = 'tedge', mode = 0o444 } - ]"#; + +files = [ +# { path = '/etc/tedge/tedge.toml' }, +# { path = '/etc/tedge/mosquitto-conf/c8y-bridge.conf', type = 'c8y-bridge.conf' }, +# { path = '/etc/tedge/mosquitto-conf/tedge-mosquitto.conf', type = 'tedge-mosquitto.conf' }, +# { path = '/etc/mosquitto/mosquitto.conf', type = 'mosquitto.conf' }, +# { path = '/etc/tedge/c8y/example.txt', type = 'example', user = 'tedge', group = 'tedge', mode = 0o444 } +]"#; create_file_with_user_group( &format!("{config_dir}/c8y/c8y-configuration-plugin.toml"), diff --git a/plugins/c8y_log_plugin/src/main.rs b/plugins/c8y_log_plugin/src/main.rs index acee7dbf..febd442f 100644 --- a/plugins/c8y_log_plugin/src/main.rs +++ b/plugins/c8y_log_plugin/src/main.rs @@ -225,17 +225,18 @@ fn create_init_logs_directories_and_files( // creating c8y-log-plugin.toml let logs_path = format!("{logs_dir}/tedge/agent/software-*"); - let data = toml::toml! { - files = [ - { type = "software-management", path = logs_path } - ] - }; + let data = format!( + r#"files = [ + {{ type = "software-management", path = "{logs_path}" }}, +]"# + ); + create_file_with_user_group( &format!("{config_dir}/{DEFAULT_PLUGIN_CONFIG_FILE}"), "root", "root", 0o644, - Some(&data.to_string()), + Some(&data), )?; Ok(()) |