iankelling.org
/
git
/
basic-https-conf
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make nginx script have roughly parity
[basic-https-conf]
/
apache-site
diff --git
a/apache-site
b/apache-site
index 59e541b648dccfdfb04e0e756f48b9b2e1ca3b1c..9a22d2aad73a308d4bffc0b4fd6c6e2a85e2dcf7 100755
(executable)
--- a/
apache-site
+++ b/
apache-site
@@
-26,10
+26,10
@@
ssl config provided by let's encrypt and my standard
location for storing certs.
EXTRA_SETTINGS_FILE can be - for stdin
location for storing certs.
EXTRA_SETTINGS_FILE can be - for stdin
--p PORT
--i Insecure, no ssl
-c CERT_DIR In priority: this arg, $ACME_TINY_WRAPPER_CERT_DIR,
$HOME/webservercerts, if the other options aren't set.
-c CERT_DIR In priority: this arg, $ACME_TINY_WRAPPER_CERT_DIR,
$HOME/webservercerts, if the other options aren't set.
+-i Insecure, no ssl
+-p PORT Main port to listen on, default 443
-r DocumentRoot
-h|--help Print help and exit
-r DocumentRoot
-h|--help Print help and exit
@@
-62,9
+62,9
@@
while true; do
done
if (( ${#@} == 2 )); then
done
if (( ${#@} == 2 )); then
- read extra_settings h <<<"${@}"
+ read
-r
extra_settings h <<<"${@}"
else
else
- read h <<<"${@}"
+ read
-r
h <<<"${@}"
fi
if [[ ! $h ]]; then
fi
if [[ ! $h ]]; then
@@
-126,7
+126,7
@@
EOF
dd of=/etc/apache2/sites-enabled/httpsredir.conf <<'EOF'
# vhost_combined with %D (request time in microseconds)
# this file is just a convenient place to drop it.
dd of=/etc/apache2/sites-enabled/httpsredir.conf <<'EOF'
# vhost_combined with %D (request time in microseconds)
# this file is just a convenient place to drop it.
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %
{ms}T
" vhost_time_combined
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %
D
" vhost_time_combined
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html