updated setup for latest apache script dependency

[iankelling.org] / setup.sh

diff --git a/setup.sh b/setup.sh
index aafb0723e9c8fd466f1e4ed3570ab2be39674268..5aaf019c160b1f6d36124994d4a6c114fb949648 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -22,12 +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
@@ -37,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 ;;
@@ -133,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