From 5afcc5b633874e8003fb541535994e048f972d4d Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sat, 1 Apr 2017 18:14:09 -0700
Subject: [PATCH] add more about me page

---
 .gitignore    |  3 ++-
 about-me.html | 20 ++++++++++++++++++++
 build.rb      |  1 +
 index.html    |  5 ++---
 setup.sh      | 10 ++++++----
 5 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 about-me.html

diff --git a/.gitignore b/.gitignore
index 8fee304..ee94f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,8 @@
 /proposed-comments
 /_site/favorite-things.html
 /_site/index.html
-
+/_site/about-me.html
+_site/libreplanet2017-temporary-hosting/
 
 /resume.md
 /_site/resume.html
diff --git a/about-me.html b/about-me.html
new file mode 100644
index 0000000..5a790c8
--- /dev/null
+++ b/about-me.html
@@ -0,0 +1,20 @@
+<ul>
+<li><a href="mailto:ian@iankelling.org">ian@iankelling.org</a></li>
+<li><a href="ian-kelling-pubkey.asc">gpg key: 0199 AD30 2539 BA2C D12E  ABF6 AACC C240 E969 C67B</a></li>
+<li><a href="https://ofswiki.org">ofswiki.org (wiki I run, mostly covering mediawiki admin)</a></li>
+<li><a href="https://github.com/ian-kelling/">GitHub profile</a></li>
+<li><a href="https://gitlab.com/iankelling">GitLab profile</a></li>
+<li><a href="https://directory.fsf.org/wiki/User:IanK">Free Software
+    Directory profile</a></li>
+<li><a href="https://bugzilla.redhat.com/page.cgi?id=user_activity.html&action=run&who=ianowl%40gmail.com&from=2005-05-01&to=2030-04-02&sort=when">Fedora Bugzilla activity</a></li>
+<li><a href="https://stackoverflow.com/users/14456/ian-kelling">StackOverflow profile</a></li>
+<li><a href="https://bugs.debian.org/cgi-bin/pkgreport.cgi?submitter=ian%40iankelling.org">Debian
+    bugs activity</a></li>
+<li><a href="https://www.mediawiki.org/wiki/Special:Contributions/Ian_Kelling">Mediawiki
+    wiki contributions</a></li>
+<li>I've contributed to various other mailing lists, source repos, etc. Some are on
+  my resume</li>
+<li><a href="https://launchpad.net/~iank">Launchpad profile</a></li>
+<li><a href="https://en.wikipedia.org/wiki/Special:Contributions/Ian_Kelling">Wikipedia contributions</a></li>
+<!-- <li><a href=""></a></li> -->
+</ul>
diff --git a/build.rb b/build.rb
index b1a3411..d16f7da 100755
--- a/build.rb
+++ b/build.rb
@@ -90,6 +90,7 @@ if File.exists? ('../resume.md')
 end
 
 stdpage('favorite-things', File.read('../favorite-things.html'))
+stdpage('about-me', File.read('../about-me.html'))
 
 # we could use ruby native stuff here, but this was
 # better documented so meh.
diff --git a/index.html b/index.html
index 4ced8e4..424cd18 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,7 @@
 <ul class="site-nav-list">
   <li><a href="/blog.html">blog</a></li>
-  <li><a href="git">git</a></li>
-  <li><a href="https://ofswiki.org">ofswiki.org</a></li>
+  <li><a href="/git">gitweb</a></li>
   <li><a href="resume.html">resume</a></li>
   <li><a href="/favorite-things.html">favorite things</a></li>
-  <li><a href="ian-kelling-pubkey.asc">gpg key</a></li>
+  <li><a href="/about-me.html">more about me</a></li>
 </ul>
diff --git a/setup.sh b/setup.sh
index aa3501f..8e8e259 100755
--- a/setup.sh
+++ b/setup.sh
@@ -22,13 +22,13 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF
-Usage: ${0##*/} [-h|--help] [DOMAIN_NAME]
+Usage: ${0##*/} [OPTIONS] [DOMAIN_NAME]
 Setup dependencies, apache, and gitweb. Then call build.rb.
 
 Default DOMAIN_NAME is iankelling.org. Domain is expected to resolve
 so we can get a let's encrypt cert.
 
-
+-p PORT      Apache port, default is *:443.
 -h|--help    Print help and exit.
 
 Note: Uses GNU getopt options parsing style
@@ -38,10 +38,12 @@ EOF
 
 ##### begin command line parsing ########
 
-temp=$(getopt -l help, h "$@") || usage 1
+port="*:443"
+temp=$(getopt -l help, p:h "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
+        -p) port=$2; shift 2 ;;
         -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error! unexpected args: $*" ; exit 1 ;;
@@ -134,7 +136,7 @@ our \$omit_owner = true;
 our \$highlight_force = 1;
 EOF
 
-apache-site - $domain <<EOF
+apache-site -p $port - $domain <<EOF
 # to run python script on my site:
 <Directory /var/www/$domain/html/on2vote>
   # to run python scripts with cgi
-- 
2.30.2