config: Align config locations with the python components

The python components expect the configuration files to be in
/etc/keylime/*.conf and the configuration snippets to be in
/etc/keylime/*.conf.d

This patch modifies the paths where the configuration files are searched
to align with the python components. In the case, the agent
configuration will be installed in /etc/keylime/agent.conf and the
snippets are searched in /etc/keylime/agent.conf.d/

Signed-off-by: Anderson Toshiyuki Sasaki <[email protected]>

Author: ansasaki

GNUmakefile

@@ -27,7 +27,9 @@ $(programs):
 
 .PHONY: install
 install: all
-	cp ${CONFFILE} /etc/${CONFFILE}
+	mkdir -p /etc/keylime/
+	mkdir -p /etc/keylime/agent.conf.d
+	cp ${CONFFILE} /etc/keylime/agent.conf
 	for f in $(programs); do \
 		install -D -t ${DESTDIR}/usr/bin "$$f"; \
 	done

src/config.rs

@@ -58,8 +58,8 @@ pub static DEFAULT_TPM_SIGNING_ALG: &str = "rsassa";
 pub static DEFAULT_EK_HANDLE: &str = "generate";
 pub static DEFAULT_RUN_AS: &str = "keylime:tss";
 pub static DEFAULT_AGENT_DATA_PATH: &str = "agent_data.json";
-pub static DEFAULT_CONFIG: &str = "/etc/keylime-agent.conf";
-pub static DEFAULT_CONFIG_SYS: &str = "/usr/etc/keylime-agent.conf";
+pub static DEFAULT_CONFIG: &str = "/etc/keylime/agent.conf";
+pub static DEFAULT_CONFIG_SYS: &str = "/usr/etc/keylime/agent.conf";
 
 impl Source for KeylimeConfig {
     fn collect(&self) -> Result<Map<String, Value>, ConfigError> {
@@ -382,7 +382,7 @@ fn config_get_file_setting() -> Result<ConfigBuilder<DefaultState>, Error> {
         )
         // Add system configuration snippets
         .add_source(
-            glob("/usr/etc/keylime-agent.conf.d/*")
+            glob("/usr/etc/keylime/agent.conf.d/*")
                 .map_err(Error::GlobPattern)?
                 .filter_map(|entry| entry.ok())
                 .map(|path| {
@@ -396,7 +396,7 @@ fn config_get_file_setting() -> Result<ConfigBuilder<DefaultState>, Error> {
         )
         // Add user configuration snippets
         .add_source(
-            glob("/etc/keylime-agent.conf.d/*")
+            glob("/etc/keylime/agent.conf.d/*")
                 .map_err(Error::GlobPattern)?
                 .filter_map(|entry| entry.ok())
                 .map(|path| {