Prechádzať zdrojové kódy

Server "complete" to Server "status"

Andrea Pollastri 5 rokov pred
rodič
commit
1b04521160

+ 1 - 1
app/Http/Controllers/ApplicationsController.php

@@ -36,7 +36,7 @@ class ApplicationsController extends Controller {
                 return redirect('/applications');
             }
         }
-        $server = Server::where('id', $request->server_id)->where('complete', 2)->firstOrFail();
+        $server = Server::where('id', $request->server_id)->where('status', 2)->firstOrFail();
         $user   = 'u'.hash('crc32', (Str::uuid()->toString())).rand(1,9);
         $pass   = sha1(uniqid().microtime().$request->domain);
         $dbpass = sha1(microtime().uniqid().$request->ip);

+ 1 - 1
app/Http/Controllers/DashboardController.php

@@ -6,7 +6,7 @@ use App\Server;
 class DashboardController extends Controller {
 
     public function index() {
-        $servers = Server::where('complete', 2)->orderBy('name')->get();
+        $servers = Server::where('status', 2)->orderBy('name')->get();
         return view('dashboard', compact('servers'));
     }
 

+ 6 - 6
app/Http/Controllers/RemoteController.php

@@ -7,27 +7,27 @@ use App\Server;
 class RemoteController extends Controller {
 
     public function start($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 0)->first();
-        $server->complete = 1;
+        $server = Server::where('servercode', $servercode)->where('status', 0)->first();
+        $server->status = 1;
         $server->save();
         return 'OK';
     }
 
     public function finalize($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->first();
-        $server->complete = 2;
+        $server = Server::where('servercode', $servercode)->where('status', 1)->first();
+        $server->status = 2;
         $server->save();
         return 'OK';
     }
 
     public function ping($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 2)->first();
+        $server = Server::where('servercode', $servercode)->where('status', 2)->first();
         $remote = Http::get('http://'.$server->ip.'/ping_'.$server->servercode.'.php');
         return $remote->status();
     }
 
     public function status($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 2)->first();
+        $server = Server::where('servercode', $servercode)->where('status', 2)->first();
         $remote = Http::get('http://'.$server->ip.'/status_'.$server->servercode.'.php');
         if($remote->status() != 200) {
             return '--;--;--';

+ 1 - 1
app/Http/Controllers/ServersController.php

@@ -16,7 +16,7 @@ class ServersController extends Controller
 
 
     public function api() {
-        return Server::orderBy('name')->orderBy('ip')->where('complete', 2)->get();
+        return Server::orderBy('name')->orderBy('ip')->where('status', 2)->get();
     }
 
 

+ 6 - 6
app/Http/Controllers/ShellController.php

@@ -18,7 +18,7 @@ class ShellController extends Controller
     }
 
     public function install($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 0)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 0)->firstOrFail();
         $script = Storage::get('scripts/install.sh');
         $script = Str::replaceArray('???', [
             $this->url->to('/'),
@@ -32,7 +32,7 @@ class ShellController extends Controller
     }
 
     public function hostadd($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 1)->firstOrFail();
         $script = Storage::get('scripts/hostadd.sh');
         $script = Str::replaceArray('???', [
             $this->url->to('/'),
@@ -57,7 +57,7 @@ class ShellController extends Controller
     }
 
     public function hostdel($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 1)->firstOrFail();
         $script = Storage::get('scripts/hostdel.sh');
         $script = Str::replaceArray('???', [
             $server->dbroot,
@@ -66,13 +66,13 @@ class ShellController extends Controller
     }
 
     public function passwd($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 1)->firstOrFail();
         $script = Storage::get('scripts/passwd.sh');
         return response($script)->withHeaders(['Content-Type' =>'application/x-sh']);
     }
 
     public function aliasadd($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 1)->firstOrFail();
         $script = Storage::get('scripts/aliasadd.sh');
         $script = Str::replaceArray('???', [
             $this->url->to('/')
@@ -81,7 +81,7 @@ class ShellController extends Controller
     }
 
     public function aliasdel($servercode) {
-        $server = Server::where('servercode', $servercode)->where('complete', 1)->firstOrFail();
+        $server = Server::where('servercode', $servercode)->where('status', 1)->firstOrFail();
         $script = Storage::get('scripts/aliasdel.sh');
         return response($script)->withHeaders(['Content-Type' =>'application/x-sh']);
     }

+ 1 - 1
database/migrations/2020_04_27_000001_create_servers_table.php

@@ -23,7 +23,7 @@ class CreateServersTable extends Migration
             $table->string('username');
             $table->string('password');
             $table->string('dbroot');
-            $table->integer('complete')->default('0');
+            $table->integer('status')->default('0');
             $table->string('servercode')->index();
             $table->timestamps();
         });

+ 2 - 2
resources/views/servers.blade.php

@@ -44,9 +44,9 @@ Servers
                     @foreach ($servers as $server)
                         <tr>
                             <td class="text-center">
-                                @if ($server->complete == 0)
+                                @if ($server->status == 0)
                                     <button type="button" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#setupModal" data-servercode="{{ $server->servercode }}" data-serverip="{{ $server->ip }}">"{{ $server->name }}" has to be installed</button>
-                                @elseif ($server->complete == 1)
+                                @elseif ($server->status == 1)
                                     <button type="button" class="btn btn-warning btn-sm">"{{ $server->name }}" is coming...</button>
                                 @else
                                     <a href="/server/{{ $server->servercode }}">{{ $server->name }}</a>