diff --git a/digwatch.yaml b/digwatch.yaml index 9d5c98f5..bc6c41ff 100644 --- a/digwatch.yaml +++ b/digwatch.yaml @@ -1,7 +1,8 @@ -rules_file: /etc/digwatch.conf +rules_file: /etc/digwatch_rules.conf # Priority level # Any rule with priority lower than this level will be discarded +# WARNING currently has no effect! priority_level: warning syslog_output: diff --git a/rules/CMakeLists.txt b/rules/CMakeLists.txt index b1c34ae1..dff2d608 100644 --- a/rules/CMakeLists.txt +++ b/rules/CMakeLists.txt @@ -1,3 +1,3 @@ -install(FILES digwatch.conf +install(FILES digwatch_rules.conf DESTINATION "${DIR_ETC}") diff --git a/rules/digwatch.conf b/rules/digwatch_rules.conf similarity index 100% rename from rules/digwatch.conf rename to rules/digwatch_rules.conf diff --git a/userspace/digwatch/configuration.cpp b/userspace/digwatch/configuration.cpp index 401d6328..06706b27 100644 --- a/userspace/digwatch/configuration.cpp +++ b/userspace/digwatch/configuration.cpp @@ -18,7 +18,7 @@ void digwatch_configuration::init(string conf_filename) string m_config_file = conf_filename; m_config = new yaml_configuration(m_config_file); - m_rules_file = m_config->get_scalar("rules_file", "/etc/digwatch.conf"); + m_rules_filename = m_config->get_scalar("rules_file", "/etc/digwatch_rules.conf"); m_priority_level = m_config->get_scalar("priority_level", "warning"); output_config file_output; diff --git a/userspace/digwatch/configuration.h b/userspace/digwatch/configuration.h index 9d3644ab..056976ea 100644 --- a/userspace/digwatch/configuration.h +++ b/userspace/digwatch/configuration.h @@ -94,7 +94,7 @@ class digwatch_configuration public: void init(std::string conf_filename); void init(); - std::string m_rules_file; + std::string m_rules_filename; std::string m_priority_level; std::vector m_outputs; private: diff --git a/userspace/digwatch/digwatch.cpp b/userspace/digwatch/digwatch.cpp index f330adb6..01d6069b 100644 --- a/userspace/digwatch/digwatch.cpp +++ b/userspace/digwatch/digwatch.cpp @@ -365,7 +365,7 @@ int digwatch_init(int argc, char **argv) digwatch_syslog::init(ls); - rules->load_rules(rules_file); + rules->load_rules(config.m_rules_filename); inspector->set_filter(rules->get_filter()); inspector->set_hostname_and_port_resolution_mode(false);