Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/service-changes

Browse source
This commit is contained in:
Dane Everitt 2016-11-28 14:02:09 -05:00
commit a2d2069d8c
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -3,6 +3,15 @@ This file is a running track of new features and fixes to each version of the pa
This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.5.3 (Bodacious Boreopterus)
### Fixed
* Fixed an error that occurred when viewing a node listing when no nodes were created yet due to a mis-declared variable. Also fixes a bug that would have all nodes trying to connect to the daemon using the same secret token on the node listing, causing only the last node to display properly.
* Fixes a bug that displayed the panel version rather than the daemon version when viewing a node.
* Fixes a multiplicator being applied to an overallocation field rather than a storage space field when adding a node.
### Changed
* Added a few new configuration variables for nodes to the default config, as well as a variable that will be used in future versions of the daemon.
## v0.5.2 (Bodacious Boreopterus)
### Fixed
* Time axis on server graphs is corrected to show the minutes rather than the current month.

4
resources/views/admin/nodes/index.blade.php
View file

@ -51,7 +51,7 @@
<tbody>
@foreach ($nodes as $node)
<tr>
<td class="text-center text-muted left-icon" data-action="ping" data-location="{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}"><i class="fa fa-fw fa-refresh fa-spin"></i></td>
<td class="text-center text-muted left-icon" data-action="ping" data-secret="{{ $node->daemonSecret }}" data-location="{{ $node->scheme }}://{{ $node->fqdn }}:{{ $node->daemonListen }}"><i class="fa fa-fw fa-refresh fa-spin"></i></td>
<td><a href="/admin/nodes/view/{{ $node->id }}">{{ $node->name }}</td>
<td>{{ $node->a_locationName }}</td>
<td class="hidden-xs">{{ $node->memory }} MB</td>
@ -76,7 +76,7 @@ $(document).ready(function () {
type: 'GET',
url: $(element).data('location'),
headers: {
'X-Access-Token': '{{ $node->daemonSecret }}'
'X-Access-Token': $(element).data('secret'),
},
timeout: 5000
}).done(function (data) {

4
resources/views/admin/nodes/new.blade.php
View file

@ -99,7 +99,7 @@
<div class="form-group col-md-6 col-xs-6">
<label for="memory_overallocate" class="control-label">Overallocate</label>
<div class="input-group">
<input type="text" name="memory_overallocate" data-multiplicator="true" class="form-control" value="{{ old('memory_overallocate', 0) }}"/>
<input type="text" name="memory_overallocate" class="form-control" value="{{ old('memory_overallocate', 0) }}"/>
<span class="input-group-addon">%</span>
</div>
</div>
@ -117,7 +117,7 @@
<div class="form-group col-md-6 col-xs-6">
<label for="disk" class="control-label">Disk Space</label>
<div class="input-group">
<input type="text" name="disk" class="form-control" value="{{ old('disk') }}"/>
<input type="text" name="disk" data-multiplicator="true" class="form-control" value="{{ old('disk') }}"/>
<span class="input-group-addon">MB</span>
</div>
</div>

8
resources/views/admin/nodes/view.blade.php
View file

@ -71,7 +71,7 @@
<tbody>
<tr>
<td>Daemon Version</td>
<td><code data-attr="info-version"><i class="fa fa-refresh fa-fw fa-spin"></i></code> (Latest: <code>{{ Version::getPanel() }}</code>)</td>
<td><code data-attr="info-version"><i class="fa fa-refresh fa-fw fa-spin"></i></code> (Latest: <code>{{ Version::getDaemon() }}</code>)</td>
</tr>
<tr>
<td>System Information</td>
@ -276,6 +276,7 @@
<div class="col-md-12">
<pre><code>{
"web": {
"host": "0.0.0.0",
"listen": {{ $node->daemonListen }},
"ssl": {
"enabled": {{ $node->scheme === 'https' ? 'true' : 'false' }},
@ -292,6 +293,10 @@
"port": {{ $node->daemonSFTP }},
"container": "ptdl-sftp"
},
"query": {
"kill_on_fail": false,
"fail_limit": 5
},
"logger": {
"path": "logs/",
"src": false,
@ -300,6 +305,7 @@
"count": 3
},
"remote": {
"base": "{{ config('app.url') }}",
"download": "{{ route('remote.download') }}",
"installed": "{{ route('remote.install') }}"
},