update web server setup dependency

diff --git a/resume.md b/resume.md
index f96d622c221111f3c2252209515897cc34eaf1d2..3fa3db3961c5c73c26f6ae38ff807385e6ef97d0 100644 (file)
--- a/resume.md
+++ b/resume.md
@@ -52,7 +52,7 @@ Haskell-mode, and Gentoo. Maintenance of two Emacs minor modes
 
 * Contributed high quality documentation improvements to a wide a array
 of projects including [Mediawiki](https://www.mediawiki.org/wiki/Special:Contributions/Ian_Kelling), [systemd](https://github.com/systemd/systemd/commits?author=ian-kelling), [Ceph](https://github.com/ceph/ceph/commit/64851f5e186d477740eb4dc8279c4f1eb620bec3), [StackOverflow](https://stackoverflow.com/users/14456/ian-kelling), Bitcoin, Beets,
-Trash-Cli, Fedora, and [Arch](https://wiki.archlinux.org/index.php/Special:Contributions/Ian_Kelling)
+FAI, Fedora, and [Arch](https://wiki.archlinux.org/index.php/Special:Contributions/Ian_Kelling)
 
 * Discovered and accurately reported on bugs in many projects including
 [Debian](https://bugs.debian.org/cgi-bin/pkgreport.cgi?dist=unstable;submitter=ian%40iankelling.org), [Bash](https://lists.gnu.org/archive/html/bug-bash/2014-06/msg00069.html), [Fedora](https://bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=POST&bug_status=MODIFIED&bug_status=ON_DEV&bug_status=ON_QA&bug_status=VERIFIED&bug_status=RELEASE_PENDING&bug_status=CLOSED&f1=reporter&list_id=5769480&o1=allwordssubstr&query_format=advanced&v1=ianowl%40gmail.com), and [Unison](https://github.com/bcpierce00/unison/issues/30)
@@ -123,7 +123,7 @@ at,
 AWS EC2/S3/SES,
 Bind,
 Btrfs,
-Ceph
+Ceph,
 cloud-init,
 Cron,
 Debian/Ubuntu,

diff --git a/setup.sh b/setup.sh
index a68c4fc7e0a6ff9d10ba02e417a637cc0ff57d37..ed295eb9172a36a04973c8458da522565c2a4c47 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -14,8 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# This script depends on a few other git repos of mine, such as
-# distro-functions, basic-https-conf, acme-tiny-wrapper
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
@@ -28,6 +26,10 @@ 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.
 
+This script depends on a few other git repos of mine: distro-functions
+and basic-https-conf.
+
+
 -p PORT      Apache port, default is 443.
 -h|--help    Print help and exit.
 
@@ -74,8 +76,6 @@ type -P a2enmod &>/dev/null || $s apt-get -y install apache2
 type -P sqlite3 &>/dev/null || $s apt-get -y install sqlite3
 
 
-acme-tiny-wrapper $domain
-
 pkgs=(
     # build.rb dependencies
     ruby-pygments.rb ruby-safe-yaml ruby-sass
@@ -138,7 +138,7 @@ our \$home_text = "$script_dir/_site/gitweb_home.html";
 our \$projects_list_group_categories = 1;
 EOF
 
-apache-site -p $port - $domain <<EOF
+web-conf -p $port - apache2 $domain <<EOF
 # to run python script on my site:
 <Directory /var/www/$domain/html/on2vote>
   # to run python scripts with cgi