http/2 support fix

andreapollastri · May 12, 2020 · 5ee112f · 5ee112f
1 parent 2fc81ae
commit 5ee112f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 (no unreleased versions)
 
+## [2.4.5] - 2020-05-12
+### Fixed
+- Bug fix on `install.sh`, `ApplicationsController.php`, `AliasesController.php`, `hostadd.sh` and `ssl.sh` for http\2 support
+
 ## [2.4.4] - 2020-05-11
 ### Fixed
 - Bug fix on `install.sh` for http\2 support

diff --git a/app/Http/Controllers/AliasesController.php b/app/Http/Controllers/AliasesController.php
@@ -95,7 +95,7 @@ public function ssl($aliascode) {
             return abort(403);
         }
         $ssh->setTimeout(360);
-        $response = $ssh->exec('echo '.$alias->application->server->password.' | sudo -S sudo sh /cipi/ssl.sh -d '.$alias->domain);
+        $response = $ssh->exec('echo '.$alias->application->server->password.' | sudo -S sudo sh /cipi/ssl.sh -d '.$alias->domain.' -c '.$alias->domain);
         if(strpos($response, '###CIPI###') === false) {
             abort(500);
         }

diff --git a/app/Http/Controllers/ApplicationsController.php b/app/Http/Controllers/ApplicationsController.php
@@ -154,7 +154,7 @@ public function ssl($appcode) {
             return abort(403);
         }
         $ssh->setTimeout(360);
-        $response = $ssh->exec('echo '.$application->server->password.' | sudo -S sudo sh /cipi/ssl.sh -d '.$application->domain);
+        $response = $ssh->exec('echo '.$application->server->password.' | sudo -S sudo sh /cipi/ssl.sh -d '.$application->domain.' -c '.$application->username);
         if(strpos($response, '###CIPI###') === false) {
             abort(500);
         }

diff --git a/storage/app/scripts/haget.conf b/storage/app/scripts/haget.conf
@@ -27,6 +27,6 @@ server {
         deny all;
     }
 
-    listen 443 ssl http2;
+    listen 443 http2;
 
 }
diff --git a/storage/app/scripts/install.sh b/storage/app/scripts/install.sh
@@ -328,8 +328,6 @@ server {
 
     listen 80 default_server;
     listen [::]:80 default_server;
-    listen 443 ssl;
-    listen [::]:443 ssl;
 
     root /var/www/html;
 

diff --git a/storage/app/scripts/ssl.sh b/storage/app/scripts/ssl.sh
@@ -8,6 +8,10 @@ while [ -n "$1" ] ; do
         shift
         DOMAIN=$1
         ;;
+    -c | --config )
+        shift
+        CONFIG=$1
+        ;;
     * )
         echo "ERROR: Unknown option: $1"
         exit -1
@@ -16,8 +20,9 @@ while [ -n "$1" ] ; do
     shift
 done
 
-
 sudo certbot --nginx -d $DOMAIN --non-interactive --agree-tos --register-unsafely-without-email
+sudo rpl -i -w "[::]:443 ssl" "[::]:443 ssl http2" /etc/nginx/sites-enabled/$CONFIG.conf
+sudo rpl -i -w "443 ssl" "443 ssl http2" /etc/nginx/sites-enabled/$CONFIG.conf
 sudo systemctl restart nginx.service