Browse Source

Move to using letsencrypt for gogs

Bob Mottram 8 years ago
parent
commit
7cbb3242bf
No account linked to committer's email
1 changed files with 2 additions and 19 deletions
  1. 2
    19
      src/freedombone

+ 2
- 19
src/freedombone View File

@@ -6664,24 +6664,7 @@ function install_gogs {
6664 6664
 	fi
6665 6665
 
6666 6666
 	if [[ $ONION_ONLY == "no" ]]; then
6667
-		echo 'server {' > /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6668
-		echo '    listen 80;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6669
-		echo "    server_name $GIT_DOMAIN_NAME;" >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6670
-		echo '    access_log off;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6671
-		echo "    error_log /var/log/nginx/${GIT_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6672
-		nginx_disable_sniffing $GIT_DOMAIN_NAME
6673
-		nginx_limits $GIT_DOMAIN_NAME
6674
-		echo '    location / {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6675
-		echo '        proxy_pass http://localhost:3000;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6676
-		echo '    }' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6677
-		echo '    location ^~ /user/ {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6678
-		echo '        rewrite ^ https://$server_name$request_uri?;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6679
-		echo '    }' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6680
-		echo '    location ^~ /admin/ {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6681
-		echo '        rewrite ^ https://$server_name$request_uri?;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6682
-		echo '    }' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6683
-		echo '}' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6684
-		echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6667
+		nginx_http_redirect $GIT_DOMAIN_NAME
6685 6668
 		echo 'server {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6686 6669
 		echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
6687 6670
 		echo "    root /var/www/$GIT_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
@@ -6742,7 +6725,7 @@ function install_gogs {
6742 6725
 
6743 6726
 	configure_php
6744 6727
 
6745
-	create_site_certificate $GIT_DOMAIN_NAME
6728
+	create_site_certificate $GIT_DOMAIN_NAME 'yes'
6746 6729
 
6747 6730
 	nginx_ensite $GIT_DOMAIN_NAME
6748 6731