From a457bf2806283101f46c16c3ec70e33b9e13482b Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Mon, 18 Jan 2016 21:35:37 -0500 Subject: [PATCH] Fix a few bugs --- app/Repositories/ServerRepository.php | 42 ++++++++++------------ resources/views/admin/nodes/view.blade.php | 4 +-- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/app/Repositories/ServerRepository.php b/app/Repositories/ServerRepository.php index 6587fe5cb..0404f54d8 100644 --- a/app/Repositories/ServerRepository.php +++ b/app/Repositories/ServerRepository.php @@ -17,6 +17,22 @@ use Pterodactyl\Exceptions\DisplayValidationException; class ServerRepository { + protected $daemonPermissions = [ + 's:get', + 's:power:start', + 's:power:stop', + 's:power:restart', + 's:power:kill', + 's:console', + 's:command', + 's:files:get', + 's:files:read', + 's:files:post', + 's:files:delete', + 's:files:upload', + 's:set-password' + ]; + public function __construct() { // @@ -236,18 +252,7 @@ class ServerRepository 'option' => $option->tag ], 'keys' => [ - (string) $server->daemonSecret => [ - 's:get', - 's:power', - 's:console', - 's:command', - 's:files:get', - 's:files:read', - 's:files:post', - 's:files:delete', - 's:files:upload', - 's:set-password' - ] + (string) $server->daemonSecret => $this->daemonPermissions ], 'rebuild' => false ] @@ -336,18 +341,7 @@ class ServerRepository 'json' => [ 'keys' => [ (string) $oldDaemonKey => [], - (string) $server->daemonSecret => [ - 's:get', - 's:power', - 's:console', - 's:command', - 's:files:get', - 's:files:read', - 's:files:post', - 's:files:delete', - 's:files:upload', - 's:set-password' - ] + (string) $server->daemonSecret => $this->daemonPermissions ] ] ]); diff --git a/resources/views/admin/nodes/view.blade.php b/resources/views/admin/nodes/view.blade.php index 9071b1967..caffb4476 100644 --- a/resources/views/admin/nodes/view.blade.php +++ b/resources/views/admin/nodes/view.blade.php @@ -248,8 +248,8 @@ "listen": {{ $node->daemonListen }}, "ssl": { "enabled": {{ $node->sceheme === 'https' ? 'true' : 'false' }}, - "certificate": "~/.ssl/ssl.cert", - "key": "~/.ssl/ssl.key" + "certificate": "/etc/letsencrypt/live/{{ $node->fqdn }}/fullchain.pem", + "key": "/etc/letsencrypt/live/{{ $node->fqdn }}/privkey.pem" } }, "docker": {