Browse Source

Basepath fix

Andrea Pollastri 5 years ago
parent
commit
1960c762d9

+ 5 - 2
app/Http/Controllers/ApplicationsController.php

@@ -25,7 +25,6 @@ class ApplicationsController extends Controller {
         $this->validate($request, [
         $this->validate($request, [
             'domain' => 'required',
             'domain' => 'required',
             'server_id' => 'required',
             'server_id' => 'required',
-            'basepath' => 'required',
             'php' => 'required'
             'php' => 'required'
         ]);
         ]);
         if(Application::where('domain', $request->domain)->where('server_id', $request->server_id)->first()) {
         if(Application::where('domain', $request->domain)->where('server_id', $request->server_id)->first()) {
@@ -65,7 +64,11 @@ class ApplicationsController extends Controller {
             return redirect('/applications');
             return redirect('/applications');
         }
         }
         $ssh->setTimeout(360);
         $ssh->setTimeout(360);
-        $response = $ssh->exec('echo '.$server->password.' | sudo -S sudo sh /cipi/host-add.sh -u '.$user.' -p '.$pass.' -dbp '.$dbpass.' -b '.$base.' -php '.$request->php.' -a '.$appcode);
+        if($base) {
+            $response = $ssh->exec('echo '.$server->password.' | sudo -S sudo sh /cipi/host-add.sh -u '.$user.' -p '.$pass.' -dbp '.$dbpass.' -b '.$base.' -php '.$request->php.' -a '.$appcode);
+        } else {
+            $response = $ssh->exec('echo '.$server->password.' | sudo -S sudo sh /cipi/host-add.sh -u '.$user.' -p '.$pass.' -dbp '.$dbpass.' -php '.$request->php.' -a '.$appcode);
+        }
         if(strpos($response, '###CIPI###') === false) {
         if(strpos($response, '###CIPI###') === false) {
             $request->session()->flash('alert-error', 'There was a problem with server scripts.');
             $request->session()->flash('alert-error', 'There was a problem with server scripts.');
             return redirect('/applications');
             return redirect('/applications');

+ 1 - 1
resources/views/applications.blade.php

@@ -104,7 +104,7 @@ Applications
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <div class="col-md-6">
                         <div class="col-md-6">
                             <div class="form-group">
                             <div class="form-group">
-                                <input id="basepath" type="text" class="form-control" name="basepath" required autocomplete="off" placeholder="E.g. 'public' or 'wp'" value="public">
+                                <input id="basepath" type="text" class="form-control" name="basepath" autocomplete="off" placeholder="E.g. 'public'" value="public">
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>

+ 1 - 1
resources/views/server.blade.php

@@ -116,7 +116,7 @@
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <label for="basepath" class="col-md-4 col-form-label text-md-right">Basepath</label>
                         <div class="col-md-6">
                         <div class="col-md-6">
                             <div class="form-group">
                             <div class="form-group">
-                                <input id="basepath" type="text" class="form-control" name="basepath" required autocomplete="off" placeholder="E.g. 'public' or 'wp'" value="public">
+                                <input id="basepath" type="text" class="form-control" name="basepath" autocomplete="off" placeholder="E.g. 'public'" value="public">
                             </div>
                             </div>
                         </div>
                         </div>
                     </div>
                     </div>