Rename digwatch.conf -> digwatch_rules.conf

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:

rules/CMakeLists.txt

@@ -1,3 +1,3 @@
-install(FILES digwatch.conf
+install(FILES digwatch_rules.conf
 	DESTINATION "${DIR_ETC}")
 

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<string>("rules_file", "/etc/digwatch.conf");
+	m_rules_filename = m_config->get_scalar<string>("rules_file", "/etc/digwatch_rules.conf");
 	m_priority_level = m_config->get_scalar<string>("priority_level", "warning");
 
 	output_config file_output;

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<output_config> m_outputs;
  private:

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);