Remove env variables from example config.

Initially this was added to make development using Docker Compose easier. However, in my experience Docker Compose is not great for the reason that there might be environmental differences between Rust running in Compose and Rust running outside Compose (if using VSCode with Rust plugin, then rust-analyzer will perform checks in the background). This and 'cross' not working properly in Compose was the reason to migrate to nix, as it provides a reproducible environment for development that can also be used by VSCode (using the Nix environment selector extension) and GitHub Actions (for the CI pipeline). As the chirpstack-docker repository provides its own configuration files, these files are not included in the Dockerfile and because we are rewriting these env variables anyway to 'localhost' in the .deb and .rpm post-installation script, it is better to set these to localhost by default. The post-installation rewrite to 'localhost' is causing issues on upgrade (#295). If we only do the rewrite on initial installation, then we run in an other issue; the package-manager will prompt that the config file has changed (from 'localhost' to '$MQTT_BROKER_HOST' for example) and will ask if you would like to overwrite or not. If the end-user would accept the config changes without looking at the diff this would break the installation as most likely, these environment are not set (which is why we were rewriting these to 'localhost' in the first place).
2025-01-30 07:33:55 +00:00 · 2023-11-22 11:10:13 +00:00 · 2023-11-22 11:10:13 +00:00 · c0cd3a3361
commit c0cd3a3361
parent 5fd56e7e3c
42 changed files with 46 additions and 58 deletions
--- a/chirpstack/Cargo.toml
+++ b/chirpstack/Cargo.toml
@ -201,10 +201,6 @@ post_install_script = '''
 chown -R chirpstack:chirpstack /etc/chirpstack
 chmod 750 /etc/chirpstack
 chmod 640 /etc/chirpstack/*.toml
-
-sed -i "s/\$MQTT_BROKER_HOST/localhost/" /etc/chirpstack/*.toml
-sed -i "s/\$POSTGRESQL_HOST/localhost/" /etc/chirpstack/*.toml
-sed -i "s/\$REDIS_HOST/localhost/" /etc/chirpstack/*.toml
 '''

 assets = [
--- a/chirpstack/configuration/chirpstack.toml
+++ b/chirpstack/configuration/chirpstack.toml
@ -19,7 +19,7 @@
  #  * require - Always SSL (skip verification)
  #  * verify-ca - Always SSL (verify that the certificate presented by the server was signed by a trusted CA)
  #  * verify-full - Always SSL (verify that the certification presented by the server was signed by a trusted CA and the server host name matches the one in the certificate)
-  dsn="postgres://chirpstack:chirpstack@$POSTGRESQL_HOST/chirpstack?sslmode=disable"
+  dsn="postgres://chirpstack:chirpstack@localhost/chirpstack?sslmode=disable"

  # Max open connections.
  #
@ -41,7 +41,7 @@
  #
  # Set multiple addresses when connecting to a cluster.
  servers=[
-    "redis://$REDIS_HOST/",
+    "redis://localhost/",
  ]

  # Redis Cluster.
@ -99,5 +99,5 @@
  enabled=["mqtt"]

  [integration.mqtt]
-    server="tcp://$MQTT_BROKER_HOST:1883/"
+    server="tcp://localhost:1883/"
    json=true
--- a/chirpstack/configuration/region_as923.toml
+++ b/chirpstack/configuration/region_as923.toml
@ -38,7 +38,7 @@
        topic_prefix="as923"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_as923_2.toml
+++ b/chirpstack/configuration/region_as923_2.toml
@ -38,7 +38,7 @@
        topic_prefix="as923_2"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_as923_3.toml
+++ b/chirpstack/configuration/region_as923_3.toml
@ -38,7 +38,7 @@
        topic_prefix="as923_3"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_as923_4.toml
+++ b/chirpstack/configuration/region_as923_4.toml
@ -38,7 +38,7 @@
        topic_prefix="as923_4"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_0.toml
+++ b/chirpstack/configuration/region_au915_0.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_0"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_1.toml
+++ b/chirpstack/configuration/region_au915_1.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_1"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_2.toml
+++ b/chirpstack/configuration/region_au915_2.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_2"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_3.toml
+++ b/chirpstack/configuration/region_au915_3.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_3"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_4.toml
+++ b/chirpstack/configuration/region_au915_4.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_4"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_5.toml
+++ b/chirpstack/configuration/region_au915_5.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_5"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_6.toml
+++ b/chirpstack/configuration/region_au915_6.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_6"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_au915_7.toml
+++ b/chirpstack/configuration/region_au915_7.toml
@ -38,7 +38,7 @@
        topic_prefix="au915_7"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_0.toml
+++ b/chirpstack/configuration/region_cn470_0.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_0"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_1.toml
+++ b/chirpstack/configuration/region_cn470_1.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_1"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_10.toml
+++ b/chirpstack/configuration/region_cn470_10.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_10"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_11.toml
+++ b/chirpstack/configuration/region_cn470_11.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_11"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_2.toml
+++ b/chirpstack/configuration/region_cn470_2.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_2"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_3.toml
+++ b/chirpstack/configuration/region_cn470_3.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_3"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_4.toml
+++ b/chirpstack/configuration/region_cn470_4.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_4"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_5.toml
+++ b/chirpstack/configuration/region_cn470_5.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_5"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_6.toml
+++ b/chirpstack/configuration/region_cn470_6.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_6"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_7.toml
+++ b/chirpstack/configuration/region_cn470_7.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_7"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_8.toml
+++ b/chirpstack/configuration/region_cn470_8.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_8"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn470_9.toml
+++ b/chirpstack/configuration/region_cn470_9.toml
@ -38,7 +38,7 @@
        topic_prefix="cn470_9"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_cn779.toml
+++ b/chirpstack/configuration/region_cn779.toml
@ -38,7 +38,7 @@
        topic_prefix="cn779"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_eu433.toml
+++ b/chirpstack/configuration/region_eu433.toml
@ -38,7 +38,7 @@
        topic_prefix="eu433"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_eu868.toml
+++ b/chirpstack/configuration/region_eu868.toml
@ -38,7 +38,7 @@
        topic_prefix="eu868"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_in865.toml
+++ b/chirpstack/configuration/region_in865.toml
@ -38,7 +38,7 @@
        topic_prefix="in865"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_ism2400.toml
+++ b/chirpstack/configuration/region_ism2400.toml
@ -38,7 +38,7 @@
        topic_prefix="ism2400"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_kr920.toml
+++ b/chirpstack/configuration/region_kr920.toml
@ -38,7 +38,7 @@
        topic_prefix="kr920"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_ru864.toml
+++ b/chirpstack/configuration/region_ru864.toml
@ -38,7 +38,7 @@
        topic_prefix="ru864"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_0.toml
+++ b/chirpstack/configuration/region_us915_0.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_0"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_1.toml
+++ b/chirpstack/configuration/region_us915_1.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_1"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_2.toml
+++ b/chirpstack/configuration/region_us915_2.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_2"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_3.toml
+++ b/chirpstack/configuration/region_us915_3.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_3"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_4.toml
+++ b/chirpstack/configuration/region_us915_4.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_4"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_5.toml
+++ b/chirpstack/configuration/region_us915_5.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_5"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_6.toml
+++ b/chirpstack/configuration/region_us915_6.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_6"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/configuration/region_us915_7.toml
+++ b/chirpstack/configuration/region_us915_7.toml
@ -38,7 +38,7 @@
        topic_prefix="us915_7"

        # MQTT server (e.g. scheme://host:port where scheme is tcp, ssl or ws)
-        server="tcp://$MQTT_BROKER_HOST:1883"
+        server="tcp://localhost:1883"

        # Connect with the given username (optional)
        username=""
--- a/chirpstack/debian/postinst
+++ b/chirpstack/debian/postinst
@ -1,16 +1,8 @@
 #!/usr/bin/env bash

-# Only execute on first install
-if [[ -z $2 ]]; then
-    # Set config-file permissions
-    chown -R chirpstack:chirpstack /etc/chirpstack
-    chmod 750 /etc/chirpstack
-    chmod 640 /etc/chirpstack/*.toml
-
-    # Set environment variables to localhost
-    sed -i "s/\$MQTT_BROKER_HOST/localhost/" /etc/chirpstack/*.toml
-    sed -i "s/\$POSTGRESQL_HOST/localhost/" /etc/chirpstack/*.toml
-    sed -i "s/\$REDIS_HOST/localhost/" /etc/chirpstack/*.toml
-fi
+# Set config-file permissions
+chown -R chirpstack:chirpstack /etc/chirpstack
+chmod 750 /etc/chirpstack
+chmod 640 /etc/chirpstack/*.toml

 #DEBHELPER#