rm -f /etc/apache2/sites-enabled/000-default.conf
mkdir -p $root
-dd of=/etc/apache2/sites-enabled/$h.conf <<EOF
+vhost_file=/etc/apache2/sites-enabled/$h.conf
+cat >$vhost_file <<EOF
<VirtualHost $port>
ServerName $h
ServerAlias www.$h
EOF
if [[ $extra_settings ]]; then
- cat -- $extra_settings | tee -a /etc/apache2/sites-enabled/$h.conf
+ cat -- $extra_settings | tee -a $vhost_file
fi
# go faster!
if [[ -e /etc/apache2/mods-available/http2.load ]]; then
# https://httpd.apache.org/docs/2.4/mod/mod_http2.html
a2enmod http2
-tee -a /etc/apache2/sites-enabled/$h.conf <<EOF
+tee -a $vhost_file <<EOF
Protocols h2 http/1.1
EOF
fi
if $ssl; then
- tee -a /etc/apache2/sites-enabled/$h.conf <<EOF
+ certbot_ssl_conf=/etc/letsencrypt/options-ssl-apache.conf
+ tee -a $vhost_file <<EOF
SSLCertificateFile $cert_dir/$h-chained.pem
SSLCertificateKeyFile $cert_dir/$h-domain.key
- Include /etc/letsencrypt/options-ssl-apache.conf
+ Include $certbot_ssl_conf
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.
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" %{ms}T" vhost_time_combined
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/html
mkdir -p /etc/letsencrypt
- base_file=/etc/letsencrypt/options-ssl-apache.conf
# this is from cerbot, see below.
- dd of=$base_file <<'EOF'
+ cat >$certbot_ssl_conf <<'EOF'
# Baseline setting to Include for SSL sites
SSLEngine on
EOF
upstream=https://github.com/certbot/certbot/raw/master/certbot-apache/certbot_apache/options-ssl-apache.conf
- if ! diff -c <(wget -q -O - $upstream) $base_file; then
+ if ! diff -c <(wget -q -O - $upstream) $certbot_ssl_conf; then
cat <<EOF
WARNING!!!!!!!!!
WARNING!!!!!!!!!
WARNING!!!!!!!!!
upstream ssl settings differ from the snapshot we have taken!!!
We diffed with this command:
-diff -c <(wget -q -O - $upstream) $base_file
+diff -c <(wget -q -O - $upstream) $certbot_ssl_conf
Update this script to take care this warning!!!!!
EOF
sleep 1
fi
fi
-tee -a /etc/apache2/sites-enabled/$h.conf <<EOF
+tee -a $vhost_file <<EOF
ErrorLog \${APACHE_LOG_DIR}/error.log
- CustomLog \${APACHE_LOG_DIR}/access.log vhost_combined
+ CustomLog \${APACHE_LOG_DIR}/access.log vhost_time_combined
</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet