瀏覽代碼

Function to rewrite http to https

Bob Mottram 9 年之前
父節點
當前提交
5af664df1b
共有 1 個檔案被更改,包括 22 行新增30 行删除
  1. 22
    30
      src/freedombone

+ 22
- 30
src/freedombone 查看文件

1437
     fi
1437
     fi
1438
 }
1438
 }
1439
 
1439
 
1440
+function website_http_redirect {
1441
+    # redirect port 80 to https
1442
+    domain_name=$1
1443
+    filename=/etc/nginx/sites-available/$domain_name
1444
+    echo 'server {' > $filename
1445
+    echo '    listen 80;' >> $filename
1446
+    echo '    listen [::]:80;' >> $filename
1447
+    echo "    server_name ${domain_name};" >> $filename
1448
+    echo "    root /var/www/${domain_name}/htdocs;" >> $filename
1449
+    echo '    access_log off;' >> $filename
1450
+    echo "    error_log /var/log/nginx/${domain_name}_error.log $WEBSERVER_LOG_LEVEL;" >> $filename
1451
+    echo '    limit_conn conn_limit_per_ip 10;' >> $filename
1452
+    echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> $filename
1453
+    echo '' >> $filename
1454
+    echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> $filename
1455
+    echo '}' >> $filename
1456
+    echo '' >> $filename
1457
+}
1458
+
1440
 function set_repo_commit {
1459
 function set_repo_commit {
1441
     repo_dir=$1
1460
     repo_dir=$1
1442
     repo_commit_name=$2
1461
     repo_commit_name=$2
6456
     ln -s /usr/share/owncloud /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs
6475
     ln -s /usr/share/owncloud /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs
6457
 
6476
 
6458
     if [[ $ONION_ONLY == "no" ]]; then
6477
     if [[ $ONION_ONLY == "no" ]]; then
6459
-        echo 'server {' > /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6460
-        echo '    listen 80;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6461
-        echo "    server_name $OWNCLOUD_DOMAIN_NAME;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6462
-        echo '    access_log off;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6463
-        echo "    error_log /var/log/nginx/${OWNCLOUD_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6464
-        echo '    limit_conn conn_limit_per_ip 10;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6465
-        echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6466
-        echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6467
-        echo '}' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6468
-        echo '' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6478
+        website_http_redirect $OWNCLOUD_DOMAIN_NAME
6469
         echo 'server {' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6479
         echo 'server {' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6470
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6480
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6471
         echo "    root /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
6481
         echo "    root /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$OWNCLOUD_DOMAIN_NAME
8662
 
8672
 
8663
     microblog_nginx_site=/etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8673
     microblog_nginx_site=/etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8664
     if [[ $ONION_ONLY == "no" ]]; then
8674
     if [[ $ONION_ONLY == "no" ]]; then
8665
-        echo 'server {' > $microblog_nginx_site
8666
-        echo '  listen 80;' >> $microblog_nginx_site
8667
-        echo '  listen [::]:80;' >> $microblog_nginx_site
8668
-        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
8669
-        echo '  rewrite ^ https://$server_name$request_uri? permanent;' >> $microblog_nginx_site
8670
-        echo '}' >> $microblog_nginx_site
8671
-        echo '' >> $microblog_nginx_site
8675
+        website_http_redirect $MICROBLOG_DOMAIN_NAME
8672
         echo 'server {' >> $microblog_nginx_site
8676
         echo 'server {' >> $microblog_nginx_site
8673
         echo '  listen 443 ssl;' >> $microblog_nginx_site
8677
         echo '  listen 443 ssl;' >> $microblog_nginx_site
8674
         echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
8678
         echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
9132
     add_ddns_domain
9136
     add_ddns_domain
9133
 
9137
 
9134
     if [[ $ONION_ONLY == "no" ]]; then
9138
     if [[ $ONION_ONLY == "no" ]]; then
9135
-        echo 'server {' > /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9136
-        echo '    listen 80;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9137
-        echo "    server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9138
-        echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9139
-        echo '    access_log off;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9140
-        echo "    error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9141
-        echo '    limit_conn conn_limit_per_ip 10;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9142
-        echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9143
-        echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9144
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9145
-        echo '    rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9146
-        echo '}' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9147
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9139
+        website_http_redirect $HUBZILLA_DOMAIN_NAME
9148
         echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9140
         echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9149
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9141
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9150
         echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
9142
         echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME