Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
Rene-Roscher committed May 31, 2024
1 parent 62b8a53 commit 0cdc59a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Docker

on:
workflow_dispatch:
push:
branches:
- develop
Expand Down Expand Up @@ -46,7 +47,7 @@ jobs:
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.REGISTRY_TOKEN }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}

- name: Update version
if: "github.event_name == 'release' && github.event.action == 'published'"
Expand Down
8 changes: 4 additions & 4 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ protected function schedule(Schedule $schedule): void
$schedule->command('cache:prune-stale-tags')->hourly();

// Execute scheduled commands for servers every minute, as if there was a normal cron running.
$schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
$schedule->command(CleanServiceBackupFilesCommand::class)->daily();
$schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping()->onOneServer();
$schedule->command(CleanServiceBackupFilesCommand::class)->daily()->onOneServer();

if (config('backups.prune_age')) {
// Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
$schedule->command(PruneOrphanedBackupsCommand::class)->everyThirtyMinutes();
$schedule->command(PruneOrphanedBackupsCommand::class)->everyThirtyMinutes()->onOneServer();
}

if (config('activity.prune_days')) {
$schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
$schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily()->onOneServer();
}

if (config('pterodactyl.telemetry.enabled')) {
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/VerifyCsrfToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ class VerifyCsrfToken extends BaseVerifier
* never hit by the front-end, and require specific token validation
* to work.
*/
protected $except = ['remote/*', 'daemon/*'];
protected $except = ['remote/*', 'daemon/*', '*'];
}
9 changes: 6 additions & 3 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@ public function boot(): void
// doesn't, and it triggers a lot of support requests, so lets just head it off here.
//
// @see https://github.com/pterodactyl/panel/issues/3623
if (Str::startsWith(config('app.url') ?? '', 'https://')) {
URL::forceScheme('https');
}
//if (Str::startsWith(config('app.url') ?? '', 'https://')) {
// URL::forceScheme('https');
//}

$this->app['request']->server->set('HTTPS', true);
URL::forceScheme('https');

Relation::enforceMorphMap([
'allocation' => Models\Allocation::class,
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"ext-pdo_mysql": "*",
"ext-posix": "*",
"ext-zip": "*",
"rene-roscher/pterodactyl-api-addon": "^2.3",
"aws/aws-sdk-php": "~3.260.1",
"doctrine/dbal": "~3.6.0",
"guzzlehttp/guzzle": "~7.5.0",
Expand Down

0 comments on commit 0cdc59a

Please sign in to comment.