starter: Allow specifying the ipsec.conf location in strongswan.conf

diff --git a/conf/options/starter.opt b/conf/options/starter.opt
index 4e6574d58e45973a2a52ecf638b95dd1b370cc20..54689e976034401b698c6d6b1a8cce13269354af 100644 (file)
--- a/conf/options/starter.opt
+++ b/conf/options/starter.opt
@@ -1,3 +1,6 @@
+starter.config_file = ${sysconfdir}/ipsec.conf
+       Location of the ipsec.conf file
+
 starter.load =
        Plugins to load in starter.
 

diff --git a/src/starter/starter.c b/src/starter/starter.c
index ea8a999f0ac071dd1e29c3fc0de7bcc88700887a..74b5b52861627e519d3b0654bbbdd027aea1cd05 100644 (file)
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -489,7 +489,8 @@ int main (int argc, char **argv)
        }
        if (!config_file)
        {
-               config_file = CONFIG_FILE;
+               config_file = lib->settings->get_str(lib->settings,
+                                                                                        "starter.config_file", CONFIG_FILE);
        }
 
        init_log("ipsec_starter");