Allow the configuration file to be specified via an environment variable.

---
 src/gclue-config.c        | 13 ++++++++++---
 src/gclue-static-source.c |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gclue-config.c b/src/gclue-config.c
index acd6009..3045571 100644
--- a/src/gclue-config.c
+++ b/src/gclue-config.c
@@ -26,8 +26,8 @@
 
 #include "gclue-config.h"
 
-#define CONFIG_FILE_PATH SYSCONFDIR "/geoclue/geoclue.conf"
-#define CONFIG_D_DIRECTORY SYSCONFDIR "/geoclue/conf.d/"
+#define CONFIG_FILE_PATH "/etc/geoclue/geoclue.conf"
+#define CONFIG_D_DIRECTORY "/etc/geoclue/conf.d/"
 
 /* This class will be responsible for fetching configuration. */
 
@@ -546,8 +546,15 @@ gclue_config_init (GClueConfig *config)
         priv->wifi_submit_url = g_strdup (DEFAULT_WIFI_SUBMIT_URL);
         priv->wifi_submit_nick = g_strdup (DEFAULT_WIFI_SUBMIT_NICK);
 
-        /* Load config file from default path, log all missing parameters */
         priv->key_file = g_key_file_new ();
+
+        char *env_config_file = g_getenv ("GEOCLUE_CONFIG_FILE");
+        if (env_config_file) {
+                load_config_file (config, env_config_file);
+                goto out; // don't load conf.d
+        }
+
+        /* Load config file from default path, log all missing parameters */
         load_config_file (config, CONFIG_FILE_PATH);
 
         /*
diff --git a/src/gclue-static-source.c b/src/gclue-static-source.c
index 1c35cea..7957797 100644
--- a/src/gclue-static-source.c
+++ b/src/gclue-static-source.c
@@ -26,7 +26,7 @@
 #include "gclue-enum-types.h"
 
 #define GEO_FILE_NAME "geolocation"
-#define GEO_FILE_PATH SYSCONFDIR "/" GEO_FILE_NAME
+#define GEO_FILE_PATH "/etc/" GEO_FILE_NAME
 
 /* Rate limit of geolocation file monitoring.
  * In milliseconds.
-- 
2.46.0

author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1ddd5336a29a63ced9fdcfaa757b100469ac09fd'>root</a>/<a href='/guix/log/po?id=1ddd5336a29a63ced9fdcfaa757b100469ac09fd'>po</a>/<a href='/guix/log/po/doc?id=1ddd5336a29a63ced9fdcfaa757b100469ac09fd'>doc</a>/<a href='/guix/log/po/doc/guix-cookbook.sv.po?id=1ddd5336a29a63ced9fdcfaa757b100469ac09fd'>guix-cookbook.sv.po</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/po/doc/guix-cookbook.sv.po?id=1ddd5336a29a63ced9fdcfaa757b100469ac09fd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-11-01 02:39:13 +0100'>2024-11-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sv.po?id=dd63cd7876f8c6a6eb42170219c17659ff4daf42'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I15d674cd8e88250daa4284e8137a808c5298548f
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-06-03 00:27:12 +0200'>2024-06-03</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.sv.po?id=834a4195241806784d4b321b95f06d85f458ce18'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.sv.po: New file.
* po/doc/local.mk: Add 'sv' cookbook.
* po/doc/po4a.cfg (po4a_langs): Add 'sv'.
* doc/local.mk: Add 'sv' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'sv'.
* doc/guix-cookbook.texi (Top): Mention 'sv' cookbook.

Change-Id: Ibfeb7254f583f1c8827e8c2756bbb02880bcba46
</span></span></td><td>Florian Pelz</td></tr>