bump version to 2.2.1 (#474)

* Fix missing ip for AWS and DO

* Fix Vultr

app/Actions/Server/CreateServer.php

@@ -86,6 +86,9 @@ private function install(Server $server): void
             while ($maxWait > 0) {
                 sleep(10);
                 $maxWait -= 10;
+                if (! $server->provider()->isRunning()) {
+                    continue;
+                }
                 try {
                     $server->ssh()->connect();
                     break;

app/ServerProviders/AWS.php

@@ -149,6 +149,10 @@ public function isRunning(): bool
                 $this->server->save();
             }
 
+            if (! $this->server->ip) {
+                return false;
+            }
+
             if (isset($result['Reservations'][0]['Instances'][0]['State']) && isset($result['Reservations'][0]['Instances'][0]['State']['Name'])) {
                 $status = $result['Reservations'][0]['Instances'][0]['State']['Name'];
                 if ($status == 'running') {

app/ServerProviders/DigitalOcean.php

@@ -176,6 +176,10 @@ public function isRunning(): bool
             $this->server->save();
         }
 
+        if (! $this->server->ip) {
+            return false;
+        }
+
         return $status->json()['droplet']['status'] == 'active';
     }
 

app/ServerProviders/Vultr.php

@@ -171,6 +171,10 @@ public function isRunning(): bool
             $this->server->save();
         }
 
+        if (! $this->server->ip) {
+            return false;
+        }
+
         return $status->json()['instance']['status'] == 'active';
     }
 

config/app.php

@@ -211,7 +211,7 @@
         // 'ExampleClass' => App\Example\ExampleClass::class,
     ])->toArray(),
 
-    'version' => '2.1.0',
+    'version' => '2.2.1',
 
     'demo' => env('APP_DEMO', false),
 ];

resources/views/ssh/cron/update.blade.php

@@ -1,4 +1,4 @@
-if ! echo '{{ $cron }}' | sudo -u {{ $user }} crontab -; then
+if ! echo '{!! $cron !!}' | sudo -u {{ $user }} crontab -; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 

resources/views/ssh/os/deploy-ssh-key.blade.php

@@ -1,3 +1,3 @@
-if ! echo '{{ $key }}' | sudo tee -a ~/.ssh/authorized_keys; then
+if ! echo '{!! $key !!}' | sudo tee -a ~/.ssh/authorized_keys; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi

resources/views/ssh/services/webserver/nginx/update-redirects.blade.php

@@ -1,4 +1,4 @@
-if ! echo '{{ $redirects }}' | sudo tee /etc/nginx/conf.d/{{ $domain }}_redirects; then
+if ! echo '{!! $redirects !!}' | sudo tee /etc/nginx/conf.d/{{ $domain }}_redirects; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi