summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-05-09 13:25:32 -0400
committerJoey Hess <joeyh@joeyh.name>2017-05-09 13:25:32 -0400
commit0032fa497e738382171145578c2f3bcb445c3d2b (patch)
tree38f1d4ed2ab6f9e7c8fc4b14743eac8958eaaf5f
parent97cbcecb523c51338ea83c4cb063120f2bf690d6 (diff)
downloaddebug-me-0032fa497e738382171145578c2f3bcb445c3d2b.tar.gz
avoid EMAIL
I think that systemd's parser for environment files does not let environment variables be built up out of previously set variables, so avoid that.
-rw-r--r--CHANGELOG3
-rw-r--r--debug-me.default6
2 files changed, 3 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 487cd25..cb4ae68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,8 @@ debug-me (1.20170506) UNRELEASED; urgency=medium
* Server: Use "postmaster" as default --from-email address
rather than "unknown@server".
- * debug-me.default: Add an EMAIL configuration.
+ * debug-me.default: Include a --from-email setting,
+ to encourage it be configured.
Thanks, Sean Whitton.
-- Joey Hess <id@joeyh.name> Tue, 09 May 2017 11:45:41 -0400
diff --git a/debug-me.default b/debug-me.default
index eca7ab5..dded3e5 100644
--- a/debug-me.default
+++ b/debug-me.default
@@ -1,6 +1,2 @@
-# Address from which session logs will be sent to the user.
-# This should be set to a real e-mail address.
-EMAIL="postmaster"
-
# Parameters to pass to debug-me when it's started as a daemon.
-DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs --from-email $EMAIL"
+DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs --from-email postmaster"