From 90fe4b3f8ad9e81cc73eb323a183c925c7795bb5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 30 Sep 2014 15:14:47 -0400 Subject: [PATCH] starter: Allow specifying the ipsec.conf location in strongswan.conf --- conf/options/starter.opt | 3 +++ src/starter/starter.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/options/starter.opt b/conf/options/starter.opt index 4e6574d58..54689e976 100644 --- 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 ea8a999f0..74b5b5286 100644 --- 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");