Merge pull request hestiacp#349 from kotso/master

serghey-rodin · serghey-rodin · commit aa8be6193321 · 2015-04-14T14:00:08.000+03:00
HTTP on 8083 and WHMCS module fixes
diff --git a/install/debian/whmcs-module.php b/install/debian/whmcs-module.php
@@ -43,6 +43,8 @@ function vesta_CreateAccount($params) {
         curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
         $answer = curl_exec($curl);
 
+		logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
         // Enable ssh access
         if(($answer == 'OK') && ($params["configoption2"] == 'on')) {
             $postvars = array(
@@ -62,6 +64,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
 
         // Add domain
@@ -84,6 +88,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
     }
 
@@ -92,8 +98,8 @@ function vesta_CreateAccount($params) {
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_TerminateAccount($params) {
@@ -122,14 +128,15 @@ function vesta_TerminateAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
     return $result;
-
 }
 
 function vesta_SuspendAccount($params) {
@@ -158,12 +165,15 @@ function vesta_SuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_UnsuspendAccount($params) {
@@ -192,12 +202,15 @@ function vesta_UnsuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+    logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_ChangePassword($params) {
@@ -227,13 +240,15 @@ function vesta_ChangePassword($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
+    
     return $result;
-
 }
 
 function vesta_ChangePackage($params) {
@@ -263,13 +278,15 @@ function vesta_ChangePackage($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_ClientArea($params) {
diff --git a/install/rhel/whmcs-module.php b/install/rhel/whmcs-module.php
@@ -43,6 +43,8 @@ function vesta_CreateAccount($params) {
         curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
         $answer = curl_exec($curl);
 
+		logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
         // Enable ssh access
         if(($answer == 'OK') && ($params["configoption2"] == 'on')) {
             $postvars = array(
@@ -62,6 +64,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
 
         // Add domain
@@ -84,6 +88,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
     }
 
@@ -92,8 +98,8 @@ function vesta_CreateAccount($params) {
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_TerminateAccount($params) {
@@ -122,14 +128,15 @@ function vesta_TerminateAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
     return $result;
-
 }
 
 function vesta_SuspendAccount($params) {
@@ -158,12 +165,15 @@ function vesta_SuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_UnsuspendAccount($params) {
@@ -192,12 +202,15 @@ function vesta_UnsuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+    logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_ChangePassword($params) {
@@ -227,13 +240,15 @@ function vesta_ChangePassword($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
+    
     return $result;
-
 }
 
 function vesta_ChangePackage($params) {
@@ -263,13 +278,15 @@ function vesta_ChangePackage($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_ClientArea($params) {
diff --git a/install/ubuntu/whmcs-module.php b/install/ubuntu/whmcs-module.php
@@ -43,6 +43,8 @@ function vesta_CreateAccount($params) {
         curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
         $answer = curl_exec($curl);
 
+		logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
         // Enable ssh access
         if(($answer == 'OK') && ($params["configoption2"] == 'on')) {
             $postvars = array(
@@ -62,6 +64,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
 
         // Add domain
@@ -84,6 +88,8 @@ function vesta_CreateAccount($params) {
             curl_setopt($curl, CURLOPT_POST, true);
             curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);
             $answer = curl_exec($curl);
+
+            logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
         }
     }
 
@@ -92,8 +98,8 @@ function vesta_CreateAccount($params) {
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_TerminateAccount($params) {
@@ -122,14 +128,15 @@ function vesta_TerminateAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
     return $result;
-
 }
 
 function vesta_SuspendAccount($params) {
@@ -158,12 +165,15 @@ function vesta_SuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_UnsuspendAccount($params) {
@@ -192,12 +202,15 @@ function vesta_UnsuspendAccount($params) {
         $answer = curl_exec($curl);
     }
 
+    logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
 
+    return $result;
 }
 
 function vesta_ChangePassword($params) {
@@ -227,13 +240,15 @@ function vesta_ChangePassword($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
+    
     return $result;
-
 }
 
 function vesta_ChangePackage($params) {
@@ -263,13 +278,15 @@ function vesta_ChangePackage($params) {
         $answer = curl_exec($curl);
     }
 
+	logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);
+
     if($answer == 'OK') {
         $result = "success";
     } else {
         $result = $answer;
     }
-    return $result;
 
+    return $result;
 }
 
 function vesta_ClientArea($params) {
diff --git a/src/rpm/conf/nginx.conf b/src/rpm/conf/nginx.conf
@@ -82,6 +82,9 @@ http {
         root            /usr/local/vesta/web;
         charset         utf-8;
 
+        // Fix error "The plain HTTP request was sent to HTTPS port"
+        error_page      497 https://$host:$server_port$request_uri;
+
         ssl                  on;
         ssl_certificate      /usr/local/vesta/ssl/certificate.crt;
         ssl_certificate_key  /usr/local/vesta/ssl/certificate.key;

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ function vesta_CreateAccount($params) {`
`43`	`43`	`curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);`
`44`	`44`	`$answer = curl_exec($curl);`
`45`	`45`
	`46`	`+ logModuleCall('vesta','CreateAccount_UserAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`47`	`+`
`46`	`48`	`// Enable ssh access`
`47`	`49`	`if(($answer == 'OK') && ($params["configoption2"] == 'on')) {`
`48`	`50`	`$postvars = array(`
`@@ -62,6 +64,8 @@ function vesta_CreateAccount($params) {`
`62`	`64`	`curl_setopt($curl, CURLOPT_POST, true);`
`63`	`65`	`curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);`
`64`	`66`	`$answer = curl_exec($curl);`
	`67`	`+`
	`68`	`+ logModuleCall('vesta','CreateAccount_EnableSSH','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
`65`	`69`	`}`
`66`	`70`
`67`	`71`	`// Add domain`
`@@ -84,6 +88,8 @@ function vesta_CreateAccount($params) {`
`84`	`88`	`curl_setopt($curl, CURLOPT_POST, true);`
`85`	`89`	`curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata);`
`86`	`90`	`$answer = curl_exec($curl);`
	`91`	`+`
	`92`	`+ logModuleCall('vesta','CreateAccount_AddDomain','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
`87`	`93`	`}`
`88`	`94`	`}`
`89`	`95`
`@@ -92,8 +98,8 @@ function vesta_CreateAccount($params) {`
`92`	`98`	`} else {`
`93`	`99`	`$result = $answer;`
`94`	`100`	`}`
`95`		`- return $result;`
`96`	`101`
	`102`	`+ return $result;`
`97`	`103`	`}`
`98`	`104`
`99`	`105`	`function vesta_TerminateAccount($params) {`
`@@ -122,14 +128,15 @@ function vesta_TerminateAccount($params) {`
`122`	`128`	`$answer = curl_exec($curl);`
`123`	`129`	`}`
`124`	`130`
	`131`	`+ logModuleCall('vesta','TerminateAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`132`	`+`
`125`	`133`	`if($answer == 'OK') {`
`126`	`134`	`$result = "success";`
`127`	`135`	`} else {`
`128`	`136`	`$result = $answer;`
`129`	`137`	`}`
`130`	`138`
`131`	`139`	`return $result;`
`132`		`-`
`133`	`140`	`}`
`134`	`141`
`135`	`142`	`function vesta_SuspendAccount($params) {`
`@@ -158,12 +165,15 @@ function vesta_SuspendAccount($params) {`
`158`	`165`	`$answer = curl_exec($curl);`
`159`	`166`	`}`
`160`	`167`
	`168`	`+ logModuleCall('vesta','SuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`169`	`+`
`161`	`170`	`if($answer == 'OK') {`
`162`	`171`	`$result = "success";`
`163`	`172`	`} else {`
`164`	`173`	`$result = $answer;`
`165`	`174`	`}`
`166`	`175`
	`176`	`+ return $result;`
`167`	`177`	`}`
`168`	`178`
`169`	`179`	`function vesta_UnsuspendAccount($params) {`
`@@ -192,12 +202,15 @@ function vesta_UnsuspendAccount($params) {`
`192`	`202`	`$answer = curl_exec($curl);`
`193`	`203`	`}`
`194`	`204`
	`205`	`+ logModuleCall('vesta','UnsuspendAccount','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`206`	`+`
`195`	`207`	`if($answer == 'OK') {`
`196`	`208`	`$result = "success";`
`197`	`209`	`} else {`
`198`	`210`	`$result = $answer;`
`199`	`211`	`}`
`200`	`212`
	`213`	`+ return $result;`
`201`	`214`	`}`
`202`	`215`
`203`	`216`	`function vesta_ChangePassword($params) {`
`@@ -227,13 +240,15 @@ function vesta_ChangePassword($params) {`
`227`	`240`	`$answer = curl_exec($curl);`
`228`	`241`	`}`
`229`	`242`
	`243`	`+ logModuleCall('vesta','ChangePassword','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`244`	`+`
`230`	`245`	`if($answer == 'OK') {`
`231`	`246`	`$result = "success";`
`232`	`247`	`} else {`
`233`	`248`	`$result = $answer;`
`234`	`249`	`}`
	`250`	`+`
`235`	`251`	`return $result;`
`236`		`-`
`237`	`252`	`}`
`238`	`253`
`239`	`254`	`function vesta_ChangePackage($params) {`
`@@ -263,13 +278,15 @@ function vesta_ChangePackage($params) {`
`263`	`278`	`$answer = curl_exec($curl);`
`264`	`279`	`}`
`265`	`280`
	`281`	`+ logModuleCall('vesta','ChangePackage','https://'.$params["serverhostname"].':8083/api/'.$postdata,$answer);`
	`282`	`+`
`266`	`283`	`if($answer == 'OK') {`
`267`	`284`	`$result = "success";`
`268`	`285`	`} else {`
`269`	`286`	`$result = $answer;`
`270`	`287`	`}`
`271`		`- return $result;`
`272`	`288`
	`289`	`+ return $result;`
`273`	`290`	`}`
`274`	`291`
`275`	`292`	`function vesta_ClientArea($params) {`