feat: add confd for config.js

Dockerfile

@@ -116,6 +116,7 @@ RUN mkdir -p /etc/modprobe.d && \
 RUN mkdir -p /usr/lib/fr24/public_html/data
 COPY --from=dump1090 /tmp/dump1090/dump1090 /usr/lib/fr24/
 COPY --from=dump1090 /tmp/dump1090/public_html /usr/lib/fr24/public_html
+RUN rm /usr/lib/fr24/public_html/config.js
 
 # PIAWARE
 COPY --from=piaware /tmp/piaware_builder /tmp/piaware_builder

root/etc/confd/html/conf.d/html.toml

@@ -0,0 +1,6 @@
+[template]
+src = "config.js.tmpl"
+dest = "/usr/lib/fr24/public_html/config.js"
+keys = [
+ "/"
+]

root/usr/lib/fr24/public_html/config.js → root/etc/confd/html/templates/config.js.tmpl

@@ -23,18 +23,18 @@ DisplayUnits = "nautical";
 // degrees.
 
 // Default center of the map.
-DefaultCenterLat = 45.0;
-DefaultCenterLon = 9.0;
+DefaultCenterLat = {{getv "/site/lat"}};
+DefaultCenterLon = {{getv "/site/lon"}};
 // The google maps zoom level, 0 - 16, lower is further out
 DefaultZoomLvl = 7;
 
 // Center marker. If dump1090 provides a receiver location,
 // that location is used and these settings are ignored.
 
 SiteShow = false; // true to show a center marker
-SiteLat = 45.0; // position of the marker
-SiteLon = 9.0;
-SiteName = "My Radar Site"; // tooltip of the marker
+SiteLat = {{getv "/site/lat"}}; // position of the marker
+SiteLon = {{getv "/site/lon"}};
+SiteName = "{{getv "/site/name"}}"; // tooltip of the marker
 
 // -- Marker settings -------------------------------------
 

root/etc/cont-init.d/01-confd-fr24feed

@@ -5,7 +5,7 @@ default_value()
  key=${1//\-/_DASH_}
  key=FR24FEED_${key^^}
  eval "value=\${$key:-\$2}"
- printf -v $key $value
+ printf -v $key "$value"
  export $key
 }
 

root/etc/cont-init.d/02-confd-piaware

@@ -5,7 +5,7 @@ default_value()
  key=${1//\-/_DASH_}
  key=PIAWARE_${key^^}
  eval "value=\${$key:-\$2}"
- printf -v $key $value
+ printf -v $key "$value"
  export $key
 }
 

root/etc/cont-init.d/03-confd-html

@@ -0,0 +1,18 @@
+#!/usr/bin/with-contenv bash
+
+default_value() 
+{ 
+ key=${1//\-/_DASH_}
+ key=HTML_${key^^}
+ eval "value=\${$key:-\$2}"
+ printf -v $key "$value"
+ export $key
+}
+
+default_value "site_lat" "45.0"
+default_value "site_lon" "9.0"
+default_value "site_name" "My Radar Site"
+
+if [ ! -f /usr/lib/fr24/public_html/config.js ]; then
+ /opt/confd/bin/confd -onetime -confdir "/etc/confd/html" -prefix "html" -backend env
+fi