Only show relevant configuration; update default path to be what the daemon expects
This commit is contained in:
parent
a342df8c13
commit
3b2e2c63c6
|
@ -138,7 +138,7 @@ class Node extends Model
|
||||||
'behind_proxy' => false,
|
'behind_proxy' => false,
|
||||||
'memory_overallocate' => 0,
|
'memory_overallocate' => 0,
|
||||||
'disk_overallocate' => 0,
|
'disk_overallocate' => 0,
|
||||||
'daemonBase' => '/srv/daemon-data',
|
'daemonBase' => '/var/lib/pterodactyl/volumes',
|
||||||
'daemonSFTP' => 2022,
|
'daemonSFTP' => 2022,
|
||||||
'daemonListen' => 8080,
|
'daemonListen' => 8080,
|
||||||
'maintenance_mode' => false,
|
'maintenance_mode' => false,
|
||||||
|
@ -178,34 +178,10 @@ class Node extends Model
|
||||||
],
|
],
|
||||||
'system' => [
|
'system' => [
|
||||||
'data' => $this->daemonBase,
|
'data' => $this->daemonBase,
|
||||||
'archive_directory' => $this->daemonBase . '/.archives',
|
|
||||||
'username' => 'pterodactyl',
|
|
||||||
'set_permissions_on_boot' => true,
|
|
||||||
'detect_clean_exit_as_crash' => false,
|
|
||||||
'sftp' => [
|
'sftp' => [
|
||||||
'use_internal' => true,
|
|
||||||
'disable_disk_checking' => false,
|
|
||||||
'bind_address' => '0.0.0.0',
|
|
||||||
'bind_port' => $this->daemonSFTP,
|
'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',
|
|
||||||
],
|
|
||||||
'disk_check_timeout' => 30,
|
|
||||||
'throttles' => [
|
|
||||||
'kill_at_count' => 5,
|
|
||||||
'decay' => 10,
|
|
||||||
'bytes' => 4096,
|
|
||||||
'check_interval' => 100,
|
|
||||||
],
|
|
||||||
'remote' => route('index'),
|
'remote' => route('index'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,7 +98,7 @@ $factory->define(Pterodactyl\Models\Node::class, function (Faker $faker) {
|
||||||
'daemon_token' => Str::random(Node::DAEMON_TOKEN_LENGTH),
|
'daemon_token' => Str::random(Node::DAEMON_TOKEN_LENGTH),
|
||||||
'daemonListen' => 8080,
|
'daemonListen' => 8080,
|
||||||
'daemonSFTP' => 2022,
|
'daemonSFTP' => 2022,
|
||||||
'daemonBase' => '/srv/daemon-data',
|
'daemonBase' => '/var/lib/pterodactyl/volumes',
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,7 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-6">
|
||||||
<label for="pDaemonBase" class="form-label">Daemon Server File Directory</label>
|
<label for="pDaemonBase" class="form-label">Daemon Server File Directory</label>
|
||||||
<input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/srv/daemon-data" />
|
<input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/var/lib/pterodactyl/volumes" />
|
||||||
<p class="text-muted small">Enter the directory where server files should be stored. <strong>If you use OVH you should check your partition scheme. You may need to use <code>/home/daemon-data</code> to have enough space.</strong></p>
|
<p class="text-muted small">Enter the directory where server files should be stored. <strong>If you use OVH you should check your partition scheme. You may need to use <code>/home/daemon-data</code> to have enough space.</strong></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-6">
|
<div class="form-group col-md-6">
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
<pre class="no-margin">{{ $node->getYamlConfiguration() }}</pre>
|
<pre class="no-margin">{{ $node->getYamlConfiguration() }}</pre>
|
||||||
</div>
|
</div>
|
||||||
<div class="box-footer">
|
<div class="box-footer">
|
||||||
<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>
|
<p class="no-margin">This file should be placed in your daemon's root directory (usually <code>/etc/pterodactyl</code>) in a file called <code>config.yml</code>.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
swal({
|
swal({
|
||||||
type: 'success',
|
type: 'success',
|
||||||
title: 'Token created.',
|
title: 'Token created.',
|
||||||
text: '<p>To auto-configure your node run the following command:<br /><small><pre>cd /srv/wings && ./wings configure --panel-url {{ config('app.url') }} --token ' + data.token + ' --node ' + data.node + '{{ config('app.debug') ? ' --allow-insecure' : '' }}</pre></small></p>',
|
text: '<p>To auto-configure your node run the following command:<br /><small><pre>cd /etc/pterodactyl && ./wings configure --panel-url {{ config('app.url') }} --token ' + data.token + ' --node ' + data.node + '{{ config('app.debug') ? ' --allow-insecure' : '' }}</pre></small></p>',
|
||||||
html: true
|
html: true
|
||||||
})
|
})
|
||||||
}).fail(function () {
|
}).fail(function () {
|
||||||
|
|
Loading…
Reference in New Issue