small updates

diff --git a/favorite-things.html b/favorite-things.html
index 52dd5fa297b97225014e609fb435249e35157d08..78af7816914b8bda809f2c1c2d28a2f79753edd7 100644 (file)
--- a/favorite-things.html
+++ b/favorite-things.html
@@ -3,11 +3,12 @@
 <ul>
 <h5>Best</h5>
 <ul>
 <ul>
 <h5>Best</h5>
 <ul>

+  <li><a href="http://theoryofeverythingpodcast.com/">Benjamin Walker's Theory of Everything</a></li>
+  <li><a href="https://www.earhustlesq.com/">Ear Hustle</a></li>

   <li><a href="http://99percentinvisible.org/">99% Invisible</a></li>
   <li><a href="http://99percentinvisible.org/">99% Invisible</a></li>

-  <li><a href="http://thisiscriminal.com/">Criminal</a></li>
-  <li><a href="http://freakonomics.com/radio/">Freakonomics</a></li>

   <li><a href="http://faif.us/">Free as in Freedom</a></li>
   <li><a href="https://gimletmedia.com/heavyweight/">Heavyweight</a></li>
   <li><a href="http://faif.us/">Free as in Freedom</a></li>
   <li><a href="https://gimletmedia.com/heavyweight/">Heavyweight</a></li>

+  <li><a href="https://latenightlinux.com/">Late Night Linux</a></li>

   <li><a href="http://www.npr.org/podcasts/510307/invisibilia">Invisibilia</a></li>
   <li><a href="https://media.libreplanet.org/">LibrePlanet as podcast</a></li>
   <li><a href="https://www.wnyc.org/shows/radiolabmoreperfect">More Perfect</a></li>
   <li><a href="http://www.npr.org/podcasts/510307/invisibilia">Invisibilia</a></li>
   <li><a href="https://media.libreplanet.org/">LibrePlanet as podcast</a></li>
   <li><a href="https://www.wnyc.org/shows/radiolabmoreperfect">More Perfect</a></li>


@@ -18,6 +19,7 @@
   <li><a href="https://gimletmedia.com/show/reply-all/">Reply All</a></li>
   <li><a href="https://www.wnyc.org/tags/tldr_podcast/">TLDR (Reply All version 1)</a></li>
   <li><a href="http://revisionisthistory.com">Revisionist History</a></li>
   <li><a href="https://gimletmedia.com/show/reply-all/">Reply All</a></li>
   <li><a href="https://www.wnyc.org/tags/tldr_podcast/">TLDR (Reply All version 1)</a></li>
   <li><a href="http://revisionisthistory.com">Revisionist History</a></li>

+  <li><a href="https://www.npr.org/podcasts/510324/rough-translation">Rough Translation</a></li>

   <li><a href="https://stownpodcast.org/">S-Town</a></li>
   <li><a href="https://serialpodcast.org/">Serial</a></li>
   <li><a href="https://www.apmpodcasts.org/thwod/">The Hilarious World of Depression</a></li>
   <li><a href="https://stownpodcast.org/">S-Town</a></li>
   <li><a href="https://serialpodcast.org/">Serial</a></li>
   <li><a href="https://www.apmpodcasts.org/thwod/">The Hilarious World of Depression</a></li>


@@ -26,28 +28,48 @@
 </ul>
 <h5>Second Best</h5>
 <ul>
 </ul>
 <h5>Second Best</h5>
 <ul>

-  <li><a href="https://gimletmedia.com/crimetown/">Crimetown</a></li>
+  <li><a href="https://wondery.com/shows/american-history-tellers/">American History Tellers</a></li>
+  <li><a href="http://www.slate.com/articles/podcasts/amicus.html">Amicus</a></li>
+  <li><a href="http://thisiscriminal.com/">Criminal</a></li>

   <li><a href="http://www.dancarlin.com/">Dan Carlin's Hardcore History</a></li>
   <li><a href="http://www.dancarlin.com/">Dan Carlin's Hardcore History</a></li>

-  <li><a href="https://twit.tv/shows/floss-weekly">FLOSS Weekly</a></li>
+  <li><a href="http://freakonomics.com/radio/">Freakonomics</a></li>

   <li><a href="http://www.npr.org/podcasts/510308/hidden-brain">Hidden Brain</a></li>
   <li><a href="http://www.atlasobscura.com/categories/horizon-line">Horizon Line</a></li>
   <li><a href="http://www.npr.org/podcasts/510308/hidden-brain">Hidden Brain</a></li>
   <li><a href="http://www.atlasobscura.com/categories/horizon-line">Horizon Line</a></li>

-  <li><a href="http://www.marketplace.org/">Marketplace</a></li>

   <li><a href="https://www.missingrichardsimmons.com/">Missing Richard Simmons</a></li>
   <li><a href="https://www.missingrichardsimmons.com/">Missing Richard Simmons</a></li>

-  <li><a href="http://www.pri.org/programs/the-world">PRI's The World</a></li>

   <li><a href="https://gimletmedia.com/science-vs/">Science Vs</a></li>
   <li><a href="http://www.slate.com/articles/podcasts/gabfest.html">Slate Political Gabfest</a></li>
   <li><a href="https://gimletmedia.com/science-vs/">Science Vs</a></li>
   <li><a href="http://www.slate.com/articles/podcasts/gabfest.html">Slate Political Gabfest</a></li>

+  <li><a href="http://www.slate.com/articles/slate_plus/watergate.html">Slow Burn: A Podcast About Watergate</a></li>

   <li><a href="http://snapjudgment.org/">Snap Judgement</a></li>
   <li><a href="https://gimletmedia.com/startup/">Startup</a></li>
   <li><a href="http://snapjudgment.org/">Snap Judgement</a></li>
   <li><a href="https://gimletmedia.com/startup/">Startup</a></li>

-  <li><a href="http://bikeshed.fm/">The Bike Shed</a></li>
+  <li><a href="https://www.npr.org/sections/money/567724614/the-indicator">The Indicator</a></li>

   <li><a href="http://themoth.org/radio">The Moth</a></li>
   <li><a href="http://themoth.org/radio">The Moth</a></li>

+  <li><a href="https://www.wnycstudios.org/shows/anxiety">The United States of Anxiety</a></li>

   <li><a href="http://www.npr.org/programs/wait-wait-dont-tell-me/">Wait Wait... Don't Tell Me!</a></li>
 </ul>
   <li><a href="http://www.npr.org/programs/wait-wait-dont-tell-me/">Wait Wait... Don't Tell Me!</a></li>
 </ul>

+<h5>Meh, some good episodes, some not so good</h5>
+<ul>
+  <li><a href="https://www.npr.org/podcasts/510312/codeswitch">Code Switch</a></li>
+  <li><a href="https://gimletmedia.com/crimetown/">Crimetown</a></li>
+  <li><a href="https://www.bloomberg.com/podcasts/decrypted">Decrypted</a></li>
+  <li><a href="https://www.npr.org/podcasts/510311/embedded">Embedded</a></li>
+  <li><a href="https://twit.tv/shows/floss-weekly">FLOSS Weekly</a></li>
+  <li><a href="http://www.marketplace.org/">Marketplace</a></li>
+  <li><a href="http://getmortified.com/podcast/">Mortified</a></li>
+  <li><a href="http://www.pri.org/programs/the-world">PRI's The World</a></li>
+  <li><a href="https://www.theallusionist.org/">The Allusionist</a></li>
+  <li><a href="http://bikeshed.fm/">The Bike Shed</a></li>
+  <li><a href="https://www.gimletmedia.com/the-nod">The Nod</a></li>
+  <li><a href="http://www.slate.com/articles/podcasts/whistlestop.html">Whistlestop</a></li>
+</ul>
+

 </ul>
 
   <!-- <li><a href=""></a></li> -->
 
 <h3>News/Blogs</h3>
 <ul>
 </ul>
 
   <!-- <li><a href=""></a></li> -->
 
 <h3>News/Blogs</h3>
 <ul>

+
+  <li><a href="http://deblanc.net/blog/">Life on M (Molly de Blanc)</a></li>

   <li><a href="https://LWN.net">LWN.net: Linux News</a></li>
   <li><a href="https://sfconservancy.org/news/">Software Conservancy News</a></li>
   <li><a href="https://mjg59.dreamwidth.org/">Mathew Garret's Blog</a></li>
   <li><a href="https://LWN.net">LWN.net: Linux News</a></li>
   <li><a href="https://sfconservancy.org/news/">Software Conservancy News</a></li>
   <li><a href="https://mjg59.dreamwidth.org/">Mathew Garret's Blog</a></li>

diff --git a/setup.sh b/setup.sh
index 3f73cfa8f5a3de5fbd347529cd4dc346eb2a000d..41e7d5089c9e1f18924ef69543fd4ce905c4db80 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -20,7 +20,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF
 
 usage() {
     cat <<EOF

-Usage: ${0##*/} [OPTIONS] [DOMAIN_NAME]
+Usage: ${0##*/} [OPTIONS] [DOMAIN_NAME] [LETSENCRYPT_EMAIL]

 Setup dependencies, apache, and gitweb. Then call build.rb.
 
 Default DOMAIN_NAME is iankelling.org. Domain is expected to resolve
 Setup dependencies, apache, and gitweb. Then call build.rb.
 
 Default DOMAIN_NAME is iankelling.org. Domain is expected to resolve


@@ -59,6 +59,10 @@ script_dir=${x%/*}
 cd $script_dir
 
 domain=${1:-iankelling.org} # use argument for testing site
 cd $script_dir
 
 domain=${1:-iankelling.org} # use argument for testing site

+email=$2
+if [[ $email ]]; then
+  email_arg="-e $email"
+  fi

 gitroot=/a/bin/githtml
 
 if [[ $EUID != 0 ]]; then
 gitroot=/a/bin/githtml
 
 if [[ $EUID != 0 ]]; then


@@ -139,7 +143,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
 our \$projects_list_group_categories = 1;
 EOF
 
 our \$projects_list_group_categories = 1;
 EOF
 

-web-conf -p $port - apache2 $domain <<EOF
+web-conf $email_arg -p $port - apache2 $domain <<EOF

 # to run python script on my site:
 <Directory /var/www/$domain/html/on2vote>
   # to run python scripts with cgi
 # to run python script on my site:
 <Directory /var/www/$domain/html/on2vote>
   # to run python scripts with cgi