[tor-commits] [flashproxy/master] embed gmail password placeholder directly in Makefile to be less confusing

[infinity0 at torproject.org]

commit 3f071c42cdc16fb6d7992d0d716dc38e9e345efe
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Sat Sep 14 16:23:19 2013 +0100

    embed gmail password placeholder directly in Makefile to be less confusing
---
 facilitator/INSTALL             |    2 +-
 facilitator/Makefile.am         |    8 ++++++--
 facilitator/conf/reg-email.pass |    3 ---
 facilitator/doc/gmail-howto.txt |    5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/facilitator/INSTALL b/facilitator/INSTALL
index 37e55c2..b7e80a3 100644
--- a/facilitator/INSTALL
+++ b/facilitator/INSTALL
@@ -22,7 +22,7 @@ copy the contents of reg-daemon.pub into the appropriate place.
 TODO(infinity0): find a better solution for this.
 
 You should also edit /usr/local/etc/flashproxy/reg-email.pass to contain your
-app-specific Gmail password; see doc/gmail-setup.txt for instructions.
+app-specific Gmail password; see doc/gmail-howto.txt for instructions.
 
 Uninstall.
 
diff --git a/facilitator/Makefile.am b/facilitator/Makefile.am
index 5705e91..d28dc48 100644
--- a/facilitator/Makefile.am
+++ b/facilitator/Makefile.am
@@ -17,7 +17,7 @@ initscript_SCRIPTS = init.d/facilitator init.d/facilitator-email-poller init.d/f
 endif
 
 dist_doc_DATA = doc/appengine-howto.txt doc/facilitator-howto.txt doc/gmail-howto.txt README
-dist_example_DATA = examples/fp-facilitator conf/reg-email.pass
+dist_example_DATA = examples/fp-facilitator
 dist_appengine_DATA = appengine/app.yaml appengine/config.go appengine/fp-reg.go appengine/README
 appengineconf_DATA = appengine/config.go
 
@@ -76,7 +76,11 @@ install-secrets:
 	install -m 600 /dev/null $(pkgconfdir)/reg-daemon.key
 	openssl genrsa 2048 | tee $(pkgconfdir)/reg-daemon.key | \
 	openssl rsa -pubout > $(pkgconfdir)/reg-daemon.pub
-	install -m 600 $(exampledir)/reg-email.pass $(pkgconfdir)/reg-email.pass
+	install -m 600 /dev/null $(pkgconfdir)/reg-email.pass
+	@echo >> $(pkgconfdir)/reg-email.pass \
+	  "Replace this file's contents with your Gmail app-specific password;"
+	@echo >> $(pkgconfdir)/reg-email.pass \
+	  "see gmail-howto.txt in this package's documentation for details."
 	chown $(fpfacilitatoruser): $(pkgconfdir)/reg-daemon.key
 	chown $(fpfacilitatoruser): $(pkgconfdir)/reg-email.pass
 
diff --git a/facilitator/conf/reg-email.pass b/facilitator/conf/reg-email.pass
deleted file mode 100644
index d1a58f7..0000000
--- a/facilitator/conf/reg-email.pass
+++ /dev/null
@@ -1,3 +0,0 @@
-Replace the contents of this file with your application-specific password for
-your Gmail account - *not* your account password. You may see gmail-setup.txt in
-this package's documentation for instructions on how to set this up.
diff --git a/facilitator/doc/gmail-howto.txt b/facilitator/doc/gmail-howto.txt
index b51ce90..f7c0598 100644
--- a/facilitator/doc/gmail-howto.txt
+++ b/facilitator/doc/gmail-howto.txt
@@ -57,5 +57,6 @@ https://www.google.com/accounts/SmsAuthConfig.
 
 Still on the 2-step summary page, click "Manage application-specific
 passwords". Enter "IMAP" for the name and click "Generate password".
-Save the password to encrypted storage. This is the password that will
-be used with the --pass option of facilitator-email-poller.
+Save the password to encrypted storage. You should save this password
+into /etc/flashproxy/reg-email.pass (or wherever you installed it), so
+that facilitator-email-poller can pick it up.