Skip to content

Commit a457bf2

Browse files
committed
Fix a few bugs
1 parent ac6edc4 commit a457bf2

File tree

2 files changed

+20
-26
lines changed

2 files changed

+20
-26
lines changed

app/Repositories/ServerRepository.php

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@
1717
class ServerRepository
1818
{
1919

20+
protected $daemonPermissions = [
21+
's:get',
22+
's:power:start',
23+
's:power:stop',
24+
's:power:restart',
25+
's:power:kill',
26+
's:console',
27+
's:command',
28+
's:files:get',
29+
's:files:read',
30+
's:files:post',
31+
's:files:delete',
32+
's:files:upload',
33+
's:set-password'
34+
];
35+
2036
public function __construct()
2137
{
2238
//
@@ -236,18 +252,7 @@ public function create(array $data)
236252
'option' => $option->tag
237253
],
238254
'keys' => [
239-
(string) $server->daemonSecret => [
240-
's:get',
241-
's:power',
242-
's:console',
243-
's:command',
244-
's:files:get',
245-
's:files:read',
246-
's:files:post',
247-
's:files:delete',
248-
's:files:upload',
249-
's:set-password'
250-
]
255+
(string) $server->daemonSecret => $this->daemonPermissions
251256
],
252257
'rebuild' => false
253258
]
@@ -336,18 +341,7 @@ public function updateDetails($id, array $data)
336341
'json' => [
337342
'keys' => [
338343
(string) $oldDaemonKey => [],
339-
(string) $server->daemonSecret => [
340-
's:get',
341-
's:power',
342-
's:console',
343-
's:command',
344-
's:files:get',
345-
's:files:read',
346-
's:files:post',
347-
's:files:delete',
348-
's:files:upload',
349-
's:set-password'
350-
]
344+
(string) $server->daemonSecret => $this->daemonPermissions
351345
]
352346
]
353347
]);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@
248248
"listen": {{ $node->daemonListen }},
249249
"ssl": {
250250
"enabled": {{ $node->sceheme === 'https' ? 'true' : 'false' }},
251-
"certificate": "~/.ssl/ssl.cert",
252-
"key": "~/.ssl/ssl.key"
251+
"certificate": "/etc/letsencrypt/live/{{ $node->fqdn }}/fullchain.pem",
252+
"key": "/etc/letsencrypt/live/{{ $node->fqdn }}/privkey.pem"
253253
}
254254
},
255255
"docker": {

0 commit comments

Comments
 (0)