Skip to content

Commit b94d69b

Browse files
authored
Introduce OOM Killer to Server Creation (pterodactyl#3548)
1 parent 5d41ac0 commit b94d69b

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<div class="form-group">
3939
<label for="pUserId">Server Owner</label>
4040
<select id="pUserId" name="owner_id" class="form-control" style="padding-left:0;"></select>
41+
<p class="small text-muted no-margin">Email address of the Server Owner.</p>
4142
</div>
4243
</div>
4344

@@ -164,7 +165,7 @@
164165
<input type="text" id="pThreads" name="threads" class="form-control" value="{{ old('threads') }}" />
165166
</div>
166167

167-
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU cores that this process can run on, or leave blank to allow all cores. This can be a single number, or a comma seperated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
168+
<p class="text-muted small"><strong>Advanced:</strong> Enter the specific CPU threads that this process can run on, or leave blank to allow all threads. This can be a single number, or a comma separated list. Example: <code>0</code>, <code>0-1,3</code>, or <code>0,1,3,4</code>.</p>
168169
</div>
169170
</div>
170171

@@ -187,17 +188,20 @@
187188
<input type="text" id="pSwap" name="swap" class="form-control" value="{{ old('swap', 0) }}" />
188189
<span class="input-group-addon">MB</span>
189190
</div>
191+
190192
<p class="text-muted small">Setting this to <code>0</code> will disable swap space on this server. Setting to <code>-1</code> will allow unlimited swap.</p>
191193
</div>
192194
</div>
193195

194196
<div class="box-body row">
195197
<div class="form-group col-xs-6">
196198
<label for="pDisk">Disk Space</label>
199+
197200
<div class="input-group">
198201
<input type="text" id="pDisk" name="disk" class="form-control" value="{{ old('disk') }}" />
199202
<span class="input-group-addon">MB</span>
200203
</div>
204+
201205
<p class="text-muted small">This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to <code>0</code> to allow unlimited disk usage.</p>
202206
</div>
203207

@@ -210,6 +214,14 @@
210214

211215
<p class="text-muted small"><strong>Advanced</strong>: The IO performance of this server relative to other <em>running</em> containers on the system. Value should be between <code>10</code> and <code>1000</code>. Please see <a href="https://docs.docker.com/engine/reference/run/#/block-io-bandwidth-blkio-constraint" target="_blank">this documentation</a> for more information about it.</p>
212216
</div>
217+
<div class="form-group col-xs-12">
218+
<div class="checkbox checkbox-primary no-margin-bottom">
219+
<input type="checkbox" id="pOomDisabled" name="oom_disabled" value="0" {{ \Pterodactyl\Helpers\Utilities::checked('oom_disabled', 0) }} />
220+
<label for="pOomDisabled" class="strong">Enable OOM Killer</label>
221+
</div>
222+
223+
<p class="small text-muted no-margin">Terminates the server if it breaches the memory limits. Enabling OOM killer may cause server processes to exit unexpectedly.</p>
224+
</div>
213225
</div>
214226
</div>
215227
</div>

0 commit comments

Comments
 (0)