Skip to content

Commit 3b2e2c6

Browse files
committed
Only show relevant configuration; update default path to be what the daemon expects
1 parent a342df8 commit 3b2e2c6

File tree

4 files changed

+5
-29
lines changed

4 files changed

+5
-29
lines changed

app/Models/Node.php

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class Node extends Model
138138
'behind_proxy' => false,
139139
'memory_overallocate' => 0,
140140
'disk_overallocate' => 0,
141-
'daemonBase' => '/srv/daemon-data',
141+
'daemonBase' => '/var/lib/pterodactyl/volumes',
142142
'daemonSFTP' => 2022,
143143
'daemonListen' => 8080,
144144
'maintenance_mode' => false,
@@ -178,34 +178,10 @@ public function getConfiguration()
178178
],
179179
'system' => [
180180
'data' => $this->daemonBase,
181-
'archive_directory' => $this->daemonBase . '/.archives',
182-
'username' => 'pterodactyl',
183-
'set_permissions_on_boot' => true,
184-
'detect_clean_exit_as_crash' => false,
185181
'sftp' => [
186-
'use_internal' => true,
187-
'disable_disk_checking' => false,
188-
'bind_address' => '0.0.0.0',
189182
'bind_port' => $this->daemonSFTP,
190-
'read_only' => false,
191183
],
192184
],
193-
'docker' => [
194-
'network' => [
195-
'interface' => '172.18.0.1',
196-
'name' => 'pterodactyl_nw',
197-
'driver' => 'bridge',
198-
],
199-
'update_images' => true,
200-
'socket' => '/var/run/docker.sock',
201-
],
202-
'disk_check_timeout' => 30,
203-
'throttles' => [
204-
'kill_at_count' => 5,
205-
'decay' => 10,
206-
'bytes' => 4096,
207-
'check_interval' => 100,
208-
],
209185
'remote' => route('index'),
210186
];
211187
}

database/factories/ModelFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
'daemon_token' => Str::random(Node::DAEMON_TOKEN_LENGTH),
9999
'daemonListen' => 8080,
100100
'daemonSFTP' => 2022,
101-
'daemonBase' => '/srv/daemon-data',
101+
'daemonBase' => '/var/lib/pterodactyl/volumes',
102102
];
103103
});
104104

resources/views/admin/nodes/new.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<div class="row">
109109
<div class="form-group col-md-6">
110110
<label for="pDaemonBase" class="form-label">Daemon Server File Directory</label>
111-
<input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/srv/daemon-data" />
111+
<input type="text" name="daemonBase" id="pDaemonBase" class="form-control" value="/var/lib/pterodactyl/volumes" />
112112
<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>
113113
</div>
114114
<div class="form-group col-md-6">

resources/views/admin/nodes/view/configuration.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<pre class="no-margin">{{ $node->getYamlConfiguration() }}</pre>
4444
</div>
4545
<div class="box-footer">
46-
<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>
46+
<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>
4747
</div>
4848
</div>
4949
</div>
@@ -71,7 +71,7 @@
7171
swal({
7272
type: 'success',
7373
title: 'Token created.',
74-
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>',
74+
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>',
7575
html: true
7676
})
7777
}).fail(function () {

0 commit comments

Comments
 (0)