From 5af664df1b4dd590ca56d0631bb5176226498d14 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 21 Feb 2016 09:59:15 +0000
Subject: [PATCH] Function to rewrite http to https

---
 src/freedombone | 52 +++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index fd4f83bf..7c2cabe8 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1437,6 +1437,25 @@ function set_default_onion_domains {
     fi
 }
 
+function website_http_redirect {
+    # redirect port 80 to https
+    domain_name=$1
+    filename=/etc/nginx/sites-available/$domain_name
+    echo 'server {' > $filename
+    echo '    listen 80;' >> $filename
+    echo '    listen [::]:80;' >> $filename
+    echo "    server_name ${domain_name};" >> $filename
+    echo "    root /var/www/${domain_name}/htdocs;" >> $filename
+    echo '    access_log off;' >> $filename
+    echo "    error_log /var/log/nginx/${domain_name}_error.log $WEBSERVER_LOG_LEVEL;" >> $filename
+    echo '    limit_conn conn_limit_per_ip 10;' >> $filename
+    echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> $filename
+    echo '' >> $filename
+    echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> $filename
+    echo '}' >> $filename
+    echo '' >> $filename
+}
+
 function set_repo_commit {
     repo_dir=$1
     repo_commit_name=$2
@@ -6456,16 +6475,7 @@ function install_owncloud {
     ln -s /usr/share/owncloud /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs
 
     if [[ $ONION_ONLY == "no" ]]; then
-        echo 'server {' > /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '    listen 80;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo "    server_name $OWNCLOUD_DOMAIN_NAME;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '    access_log off;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo "    error_log /var/log/nginx/${OWNCLOUD_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '    limit_conn conn_limit_per_ip 10;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '}' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
-        echo '' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
+        website_http_redirect $OWNCLOUD_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
         echo "    root /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
@@ -8662,13 +8672,7 @@ function install_gnu_social {
 
     microblog_nginx_site=/etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
     if [[ $ONION_ONLY == "no" ]]; then
-        echo 'server {' > $microblog_nginx_site
-        echo '  listen 80;' >> $microblog_nginx_site
-        echo '  listen [::]:80;' >> $microblog_nginx_site
-        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
-        echo '  rewrite ^ https://$server_name$request_uri? permanent;' >> $microblog_nginx_site
-        echo '}' >> $microblog_nginx_site
-        echo '' >> $microblog_nginx_site
+        website_http_redirect $MICROBLOG_DOMAIN_NAME
         echo 'server {' >> $microblog_nginx_site
         echo '  listen 443 ssl;' >> $microblog_nginx_site
         echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
@@ -9132,19 +9136,7 @@ function install_hubzilla {
     add_ddns_domain
 
     if [[ $ONION_ONLY == "no" ]]; then
-        echo 'server {' > /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    listen 80;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo "    server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    access_log off;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo "    error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    limit_conn conn_limit_per_ip 10;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '}' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+        website_http_redirect $HUBZILLA_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME