update dependency script for web server setup

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