[tor-commits] [bridgedb/master] Allow passing the Gmail key as env variable.

[phw@xxxxxxxxxxxxxx]

commit 74b159e9c2c473f02b629cd4bf7152a363770666
Author: Philipp Winter <phw@xxxxxxxxx>
Date:   Mon May 11 12:13:32 2020 -0700

    Allow passing the Gmail key as env variable.
---
 scripts/nagios-email-check | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/nagios-email-check b/scripts/nagios-email-check
index b9fc831..51c63a1 100755
--- a/scripts/nagios-email-check
+++ b/scripts/nagios-email-check
@@ -10,8 +10,12 @@
 #
 # Run this script via crontab every three hours as follows:
 #   0 */3 * * * path/to/nagios-email-check $(cat path/to/gmail.key)
+#
+# You can provide the Gmail key as an argument (as exemplified above) or by
+# using the environment variable BRIDGEDB_GMAIL_KEY, e.g.:
+#   BRIDGEDB_GMAIL_KEY=foo path/to/nagios-email-check $(cat path/to/gmail.key)
 
-
+import os
 import sys
 import smtplib
 import time
@@ -161,9 +165,15 @@ if __name__ == "__main__":
     if len(sys.argv) == 2:
         password = sys.argv[1]
     else:
-        log("No email password provided.")
-        write_status_file(UNKNOWN, "No email password provided")
-        sys.exit(1)
+
+        # Try to find our password in an environment variable.
+
+        try:
+            password = os.environ["BRIDGEDB_GMAIL_KEY"]
+        except KeyError:
+            log("No email password provided.")
+            write_status_file(UNKNOWN, "No email password provided")
+            sys.exit(1)
 
     # Send an email request to BridgeDB.
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits