git » debian:dnss » commit acb22df

Make the monitoring flag easier to configure

author Alberto Bertogli (debian)
2016-11-28 19:57:35 UTC
committer Alberto Bertogli (debian)
2016-11-28 20:12:31 UTC
parent fb9ea97e5ef078d39dac3ebb28449cb17bf5d9f4
Make the monitoring flag easier to configure

This patch adds the monitoring flag to the default file, so it's easier
for users to disable and/or change the address of the monitoring socket.
debian/default +5 -0
debian/systemd/dnss-grpc-server.service +2 -1
debian/systemd/dnss-to-grpc.service +1 -1
debian/systemd/dnss-to-https.service +2 -1 
diff --git a/debian/default b/debian/default
index 44e728d..6713cf3 100644
--- a/debian/default
+++ b/debian/default
@@ -3,3 +3,8 @@
 # /etc/ssl/dnss/grpc-upstream-cert.pem
 # Example: GRPC_UPSTREAM_ADDRESS="1.2.3.4:9953"
 GRPC_UPSTREAM_ADDRESS=
+
+# Flag to configure monitoring.
+# By default, we listen on 127.0.0.1:9981, but this variable allows you to
+# change that. To disable monitoring entirely, leave this empty.
+MONITORING_FLAG="--monitoring_listen_addr=127.0.0.1:9981"
diff --git a/debian/systemd/dnss-grpc-server.service b/debian/systemd/dnss-grpc-server.service
index b15ef91..57511b4 100644
--- a/debian/systemd/dnss-grpc-server.service
+++ b/debian/systemd/dnss-grpc-server.service
@@ -3,10 +3,11 @@ Description=dnss daemon - GRPC to DNS mode
 
 
 [Service]
+EnvironmentFile=-/etc/default/dnss
 ExecStart=/usr/bin/dnss --enable_grpc_to_dns \
         --grpc_key=/etc/ssl/dnss/grpc-server-key.pem \
         --grpc_cert=/etc/ssl/dnss/grpc-server-cert.pem \
-        --monitoring_listen_addr=127.0.0.1:9981 \
+	${MONITORING_FLAG} \
         --logtostderr
 
 Type=simple
diff --git a/debian/systemd/dnss-to-grpc.service b/debian/systemd/dnss-to-grpc.service
index c754022..bed4520 100644
--- a/debian/systemd/dnss-to-grpc.service
+++ b/debian/systemd/dnss-to-grpc.service
@@ -10,7 +10,7 @@ EnvironmentFile=-/etc/default/dnss
 ExecStart=/usr/bin/dnss \
         --dns_listen_addr=systemd \
         --logtostderr \
-        --monitoring_listen_addr=127.0.0.1:9981 \
+	${MONITORING_FLAG} \
         --grpc_upstream=${GRPC_UPSTREAM_ADDRESS} \
         --grpc_client_cafile=/etc/ssl/dnss/grpc-upstream-cert.pem \
         --enable_dns_to_grpc
diff --git a/debian/systemd/dnss-to-https.service b/debian/systemd/dnss-to-https.service
index a29f4ff..f77111b 100644
--- a/debian/systemd/dnss-to-https.service
+++ b/debian/systemd/dnss-to-https.service
@@ -6,10 +6,11 @@ Requires=dnss-to-https.socket
 
 
 [Service]
+EnvironmentFile=-/etc/default/dnss
 ExecStart=/usr/bin/dnss \
         --dns_listen_addr=systemd \
         --logtostderr \
-        --monitoring_listen_addr=127.0.0.1:9981 \
+	${MONITORING_FLAG} \
         --enable_dns_to_https
 
 Type=simple