fix: Use macro to define /etc/underpass directory

hotosm · Mar 28, 2024 · 8dbdde5 · 8dbdde5
1 parent 614c79b
commit 8dbdde5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/replicator/planetreplicator.cc b/src/replicator/planetreplicator.cc
@@ -102,7 +102,7 @@ PlanetReplicator::PlanetReplicator(void) {};
 std::shared_ptr<RemoteURL> PlanetReplicator::findRemotePath(const underpassconfig::UnderpassConfig &config, ptime time) {
     yaml::Yaml yaml;
 
-    std::string rep_file = "/etc/underpass/replicator/planetreplicator.yaml";
+    std::string rep_file = "ETCDIR/replicator/planetreplicator.yaml";
     yaml.read(rep_file);
     std::map<int, ptime> hashes;
 

diff --git a/src/stats/statsconfig.cc b/src/stats/statsconfig.cc
@@ -51,7 +51,7 @@ namespace statsconfig {
 
     StatsConfig::StatsConfig() {
         if (path.empty()) {
-            path = "/etc/underpass/stats/statistics.yaml";
+            path = "ETCDIR/stats/statistics.yaml";
             if (!boost::filesystem::exists(path)) {
                 throw std::runtime_error("Statistics file not found: " + path);
             }

diff --git a/src/testsuite/libunderpass.all/geo-test.cc b/src/testsuite/libunderpass.all/geo-test.cc
@@ -61,7 +61,7 @@ main(int argc, char* argv[])
         return 1;
     }
 
-    if (tgu.readFile("/etc/underpass/priority.geojson")) {
+    if (tgu.readFile("ETCDIR/priority.geojson")) {
         runtest.pass("Read file with absolute path");
     } else {
         runtest.fail("Read file with absolute path");

diff --git a/src/underpass.cc b/src/underpass.cc
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
 {
 
     std::string datadir = "replication/";
-    std::string boundary = "/etc/underpass/priority.geojson";
+    std::string boundary = "ETCDIR/priority.geojson";
 
     UnderpassConfig config;