From c10296648518753a70a8fad2be867b2299ff601d Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Sun, 2 Apr 2017 17:50:18 -0700
Subject: [PATCH] be less verbose

---
 apache-site | 19 +++++++++++--------
 nginx-site  | 17 +++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/apache-site b/apache-site
index 5e3f8c4..cf0aa4a 100755
--- a/apache-site
+++ b/apache-site
@@ -127,7 +127,8 @@ if $ssl; then
 fi
 
 
-tee $vhost_file <<EOF
+echo "$0: creating $vhost_file"
+cat >$vhost_file <<EOF
 <VirtualHost $addr_port>
         ServerName $h
         ServerAlias www.$h
@@ -135,21 +136,21 @@ tee $vhost_file <<EOF
 EOF
 
 if [[ $extra_settings ]]; then
-    cat -- $extra_settings | tee -a $vhost_file
+    cat -- $extra_settings >>$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 $vhost_file <<EOF
+    cat >>$vhost_file <<EOF
         Protocols h2 http/1.1
 EOF
 fi
 
 if $ssl; then
     certbot_ssl_conf=/etc/letsencrypt/options-ssl-apache.conf
-    tee -a $vhost_file <<EOF
+    cat >>$vhost_file <<EOF
         SSLCertificateFile $cert_dir/$h-chained.pem
         SSLCertificateKeyFile $cert_dir/$h-domain.key
         Include $certbot_ssl_conf
@@ -158,7 +159,8 @@ EOF
     # if we are using a non-standard port, setup don't setup
     # irrelevant 443 redirect.
     if [[ $port == "443" ]]; then
-        tee $redir_file <<'EOF'
+        echo "$0: creating $redir_file"
+        cat >$redir_file <<'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\" %D" vhost_time_combined
@@ -176,7 +178,7 @@ RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,QSA,R=permanent]
 </VirtualHost>
 EOF
         if ! $listen_80; then
-            tee -a $redir_file <<'EOF'
+            cat >>$redir_file <<'EOF'
 Listen 80
 EOF
         fi
@@ -185,6 +187,7 @@ EOF
     mkdir -p /etc/letsencrypt
 
     # this is from cerbot, see below.
+    echo "$0: creating $certbot_ssl_conf"
     cat >$certbot_ssl_conf <<'EOF'
 # Baseline setting to Include for SSL sites
 
@@ -226,7 +229,7 @@ EOF
         sleep 1
     fi
 fi
-tee -a $vhost_file <<EOF
+cat >>$vhost_file <<EOF
         ErrorLog \${APACHE_LOG_DIR}/error.log
         CustomLog \${APACHE_LOG_DIR}/access.log vhost_time_combined
 </VirtualHost>
@@ -234,7 +237,7 @@ EOF
 
 if ! $listen_port; then
     # reference: https://httpd.apache.org/docs/2.4/mod/mpm_common.html#listen
-    tee -a $vhost_file <<EOF
+    cat >>$vhost_file <<EOF
 listen ${port}${https_arg}
 EOF
 fi
diff --git a/nginx-site b/nginx-site
index f66b40c..937c71a 100755
--- a/nginx-site
+++ b/nginx-site
@@ -84,13 +84,14 @@ fi
 
 ##### end command line parsing ########
 
-sudo rm -f /etc/nginx/sites-enabled/default
+rm -f /etc/nginx/sites-enabled/default
 
 if nginx -V |& grep -- '--with-http_v2_module\b' &>/dev/null; then
     http2_arg=http2
 fi
 
-sudo dd of=/etc/nginx/sites-enabled/$h.conf <<EOF
+echo "$0: creating /etc/nginx/sites-enabled/$h.conf"
+cat >/etc/nginx/sites-enabled/$h.conf <<EOF
 # ssecurty settings taken from
 # https://mozilla.github.io/server-side-tls/ssl-config-generator/
 # using modern config. last checked 2017/2/20
@@ -134,11 +135,11 @@ server {
     #resolver <IP DNS resolver>;
 EOF
 if [[ $extra_settings ]]; then
-    cat $extra_settings | sudo tee -a /etc/nginx/sites-enabled/$h.conf
+    cat $extra_settings >>/etc/nginx/sites-enabled/$h.conf
 fi
 
 if [[ $proxy_port ]]; then
-    sudo tee -a /etc/nginx/sites-enabled/$h.conf <<EOF
+    cat >>/etc/nginx/sites-enabled/$h.conf <<EOF
     location / {
         proxy_set_header Host \$host;
         proxy_set_header X-Real-IP \$remote_addr;
@@ -151,9 +152,9 @@ EOF
 fi
 
 
-sudo tee -a /etc/nginx/sites-enabled/$h.conf <<EOF
+cat >>/etc/nginx/sites-enabled/$h.conf <<EOF
 }
 EOF
-sudo mkdir -p /var/www/$h/html
-sudo chown -R ian:ian /var/www/$h
-sudo service nginx restart
+mkdir -p /var/www/$h/html
+chown -R ian:ian /var/www/$h
+service nginx restart
-- 
2.30.2