Use YAML for configuration file

Author: DaneEveritt

app/Http/Controllers/Daemon/ActionController.php

@@ -102,6 +102,6 @@ public function configuration(Request $request, $token)
         $node = Node::findOrFail($nodeId);
 
         // Manually as getConfigurationAsJson() returns it in correct format already
-        return response($node->getConfigurationAsJson())->header('Content-Type', 'text/json');
+        return [];
     }
 }

app/Models/Node.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Models;
 
+use Symfony\Component\Yaml\Yaml;
 use Illuminate\Notifications\Notifiable;
 use Pterodactyl\Models\Traits\Searchable;
 
@@ -151,71 +152,58 @@ public function getConnectionAddress(): string
     /**
      * Returns the configuration in JSON format.
      *
-     * @param bool $pretty
      * @return string
      */
-    public function getConfigurationAsJson($pretty = false)
+    public function getYamlConfiguration()
     {
         $config = [
-            'web' => [
+            'debug' => false,
+            'api' => [
                 'host' => '0.0.0.0',
-                'listen' => $this->daemonListen,
+                'port' => $this->daemonListen,
                 'ssl' => [
                     'enabled' => (! $this->behind_proxy && $this->scheme === 'https'),
                     'certificate' => '/etc/letsencrypt/live/' . $this->fqdn . '/fullchain.pem',
                     'key' => '/etc/letsencrypt/live/' . $this->fqdn . '/privkey.pem',
                 ],
+                'upload_limit' => $this->upload_size,
             ],
-            'docker' => [
-                'container' => [
-                    'user' => null,
+            'system' => [
+                'data' => $this->daemonBase,
+                'username' => 'pterodactyl',
+                'timezone_path' => '/etc/timezone',
+                'set_permissions_on_boot' => true,
+                'detect_clean_exit_as_crash' => false,
+                'sftp' => [
+                    'use_internal' => true,
+                    'disable_disk_checking' => false,
+                    'bind_address' => '0.0.0.0',
+                    'bind_port' => $this->daemonSFTP,
+                    'read_only' => false,
                 ],
+            ],
+            'docker' => [
                 'network' => [
+                    'interface' => '172.18.0.1',
                     'name' => 'pterodactyl_nw',
+                    'driver' => 'bridge',
                 ],
+                'update_images' => true,
                 'socket' => '/var/run/docker.sock',
-                'autoupdate_images' => true,
-            ],
-            'filesystem' => [
-                'server_logs' => '/tmp/pterodactyl',
-            ],
-            'internals' => [
-                'disk_use_seconds' => 30,
-                'set_permissions_on_boot' => true,
-                'throttle' => [
-                    'enabled' => true,
-                    'kill_at_count' => 5,
-                    'decay' => 10,
-                    'lines' => 1000,
-                    'check_interval_ms' => 100,
-                ],
-            ],
-            'sftp' => [
-                'path' => $this->daemonBase,
-                'ip' => '0.0.0.0',
-                'port' => $this->daemonSFTP,
-                'keypair' => [
-                    'bits' => 2048,
-                    'e' => 65537,
-                ],
-            ],
-            'logger' => [
-                'path' => 'logs/',
-                'src' => false,
-                'level' => 'info',
-                'period' => '1d',
-                'count' => 3,
-            ],
-            'remote' => [
-                'base' => route('index'),
+                'timezone_path' => '/etc/timezone',
             ],
-            'uploads' => [
-                'size_limit' => $this->upload_size,
+            'disk_check_timeout' => 30,
+            'throttles' => [
+                'kill_at_count' => 5,
+                'decay' => 10,
+                'bytes' => 4096,
+                'check_interval' => 100,
             ],
-            'keys' => [$this->daemonSecret],
+            'remote' => route('index'),
+            'token' => $this->daemonSecret,
         ];
 
-        return json_encode($config, ($pretty) ? JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT : JSON_UNESCAPED_SLASHES);
+        return Yaml::dump($config, 4, 2);
     }
 
     /**

composer.json

@@ -34,12 +34,13 @@
         "s1lentium/iptools": "^1.1",
         "spatie/laravel-fractal": "^5.6",
         "staudenmeir/belongs-to-through": "^2.6",
+        "symfony/yaml": "^4.0",
         "webmozart/assert": "^1.5"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.2",
         "barryvdh/laravel-ide-helper": "^2.6",
-        "codedungeon/phpunit-result-printer": "^0.26",
+        "codedungeon/phpunit-result-printer": "0.25.1",
         "friendsofphp/php-cs-fixer": "^2.15.1",
         "laravel/dusk": "^5.5",
         "php-mock/php-mock-phpunit": "^2.4",

composer.lock

@@ -40,10 +40,10 @@
                 <h3 class="box-title">Configuration File</h3>
             </div>
             <div class="box-body">
-                <pre class="no-margin">{{ $node->getConfigurationAsJson(true) }}</pre>
+                <pre class="no-margin">{{ $node->getYamlConfiguration() }}</pre>
             </div>
             <div class="box-footer">
-                <p class="no-margin">This file should be placed in your daemon's <code>config</code> directory in a file called <code>core.json</code>.</p>
+                <p class="no-margin">This file should be placed in your daemon's root directory (usually <code>/srv/wings</code>) in a file called <code>config.yml</code>.</p>
             </div>
         </div>
     </div>