X-Git-Url: https://iankelling.org/git/?p=basic-https-conf;a=blobdiff_plain;f=apache-site;h=8ff08b8d63594bdffd2dbb19dea991d31cf41a3f;hp=2405713b8f6257a374ce3b2c6975a9bbf1f42671;hb=79707a58470ef41c8b1f07d1b9fb5b4cbfe46c6c;hpb=8d1ae39c659072b6407e913ac8a4df998f2c159a

diff --git a/apache-site b/apache-site
index 2405713..8ff08b8 100755
--- a/apache-site
+++ b/apache-site
@@ -18,6 +18,8 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
+shopt -s nullglob # used in apache config file expansion
+
 usage() {
     cat <<EOF
 Usage: ${0##*/} [OPTIONS] [EXTRA_SETTINGS_FILE] DOMAIN
@@ -30,8 +32,8 @@ EXTRA_SETTINGS_FILE can be - for stdin
                   $HOME/webservercerts, if the other options aren't set.
 -f [ADDR:]PORT    Enable proxy to [ADDR:]PORT. ADDR default is 127.0.0.1
 -i                Insecure, no ssl
--p PORT           Main port to listen on, default 443
--r                DocumentRoot
+-p PORT           Main port to listen on, default 443. 80 implies -i.
+-r DIR            DocumentRoot
 -h|--help         Print help and exit
 
 Note: Uses GNU getopt options parsing style
@@ -110,9 +112,17 @@ listen_80=false
 listen_port=false
 cd /etc/apache2
 conf_files=(apache2.conf)
+
+
+if [[ $port == 80 ]]; then
+    ssl=false
+    # remove any thats hanging around
+    rm -f $redir_file
+fi
+
 for (( i=0; i < ${#conf_files[@]}; i++ )); do
     f="${conf_files[i]}"
-    # note: globs are expanded here:
+    # note: globs are expanded here.
     conf_files+=( $(sed -rn "s,^\s*Include(Optional)?\s+(\S+).*,\2,p" "$f") )
     case $(readlink -f "$f") in
         $vhost_file|$redir_file) continue ;;
@@ -161,8 +171,10 @@ if [[ $proxy ]]; then
 EOF
 fi
 
+
+
 if $ssl; then
-    certbot_ssl_conf=/etc/letsencrypt/options-ssl-apache.conf
+    certbot_ssl_conf=/etc/apache2/apache-site-ssl.conf
     cat >>$vhost_file <<EOF
         SSLCertificateFile $cert_dir/$h-chained.pem
         SSLCertificateKeyFile $cert_dir/$h-domain.key
@@ -241,7 +253,8 @@ Update this script to take care this warning!!!!!
 EOF
         sleep 1
     fi
-fi
+fi # end if $ssl
+
 cat >>$vhost_file <<EOF
         ErrorLog \${APACHE_LOG_DIR}/error.log
         CustomLog \${APACHE_LOG_DIR}/access.log vhost_time_combined