From db15d1eb06ff50c9fdbce98012f64b435566c18c Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Fri, 2 Mar 2018 01:28:07 -0500
Subject: generate passwords instead of storing them

---
 .gitignore                        |  2 ++
 Makefile                          | 11 ++++++++++-
 mpdscribble/mpdscribble.conf      |  7 -------
 mpdscribble/mpdscribble.conf.tmpl |  7 +++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
 delete mode 100644 mpdscribble/mpdscribble.conf
 create mode 100644 mpdscribble/mpdscribble.conf.tmpl

diff --git a/.gitignore b/.gitignore
index 5dbbbba..12ca5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /interhack/servers
 /interhack/ttyrec
 /less
+/mpdscribble/mpdscribble.conf
 /mutt/aliases
 /mutt/cache
 /mutt/extra
@@ -26,3 +27,4 @@ supervise/
 /vim/spell/*.spl
 /weechat/weechat_fifo_*
 /weechat/weechat.log
+/wunderground
diff --git a/Makefile b/Makefile
index 4edafa4..f78dd7c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ INSTALL   = agignore \
 	    tigrc \
 	    tmux.conf \
 	    vimrc \
+	    wunderground \
 	    xbindkeysrc \
 	    Xdefaults \
 	    xinitrc \
@@ -78,7 +79,9 @@ BUILD     = $(patsubst services/available/%,services/enabled/%,$(wildcard servic
 	    $(addsuffix .dat,$(filter-out %.dat,$(wildcard fortune/*))) \
 	    $(addsuffix tags,$(wildcard vim/pack/*/start/*/doc/)) \
 	    vim/spell/en.utf-8.add.spl \
-	    less
+	    less \
+	    wunderground \
+	    mpdscribble/mpdscribble.conf
 
 ECHO      = @echo
 LN        = @ln -sf
@@ -133,6 +136,12 @@ fortune/%.dat : fortune/%
 less : lesskey
 	lesskey -o less lesskey
 
+wunderground :
+	pass show websites/wunderground.com/wunderground@tozt.net > $@
+
+mpdscribble/mpdscribble.conf : mpdscribble/mpdscribble.conf.tmpl
+	perl -E'while (<STDIN>) { if (/^password =/) { say "password = $$ARGV[0]" } else { print } }' "$$(pass show websites/last.fm/doyster)" < $< > $@
+
 $(INTO)/Maildir/.notmuch: notmuch
 	mkdir -p $(INTO)/Maildir
 	@[ ! -e $@ ] || [ -h $@ ] || mv -f $@ $@.bak
diff --git a/mpdscribble/mpdscribble.conf b/mpdscribble/mpdscribble.conf
deleted file mode 100644
index c216dfc..0000000
--- a/mpdscribble/mpdscribble.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-username = doyster
-password =
-verbose = 5
-log = -
-cache = ~/.cache/mpd/mpdscribble.cache
-musicdir = ~/media/audio/copy
-host = localhost
diff --git a/mpdscribble/mpdscribble.conf.tmpl b/mpdscribble/mpdscribble.conf.tmpl
new file mode 100644
index 0000000..c216dfc
--- /dev/null
+++ b/mpdscribble/mpdscribble.conf.tmpl
@@ -0,0 +1,7 @@
+username = doyster
+password =
+verbose = 5
+log = -
+cache = ~/.cache/mpd/mpdscribble.cache
+musicdir = ~/media/audio/copy
+host = localhost
-- 
cgit v1.2.3-54-g00ecf