From acdc78e89dc00af07576a55a6ee00c06d8f1d3ba Mon Sep 17 00:00:00 2001 From: TrixterTheTux Date: Sat, 7 Oct 2017 06:19:11 +0300 Subject: [PATCH 1/3] Fix for #630 (#657) --- CHANGELOG.md | 1 + database/seeds/VoiceServiceTableSeeder.php | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d74573ba2..24157763a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. * Using default value in rules when creating a new variable if the rules is empty. * Fixes a design-flaw in the allocation management part of nodes that would run a MySQL query for each port being allocated. This behavior is now changed to only execute one query to add multiple ports at once. * Attempting to create a server when no nodes are configured now redirects to the node creation page. +* Fixes missing library issue for teamspeak when used with mariadb. ## v0.6.4 (Courageous Carniadactylus) ### Fixed diff --git a/database/seeds/VoiceServiceTableSeeder.php b/database/seeds/VoiceServiceTableSeeder.php index 193e45741..b9d0f0977 100644 --- a/database/seeds/VoiceServiceTableSeeder.php +++ b/database/seeds/VoiceServiceTableSeeder.php @@ -101,6 +101,7 @@ curl -sSLO http://dl.4players.de/ts/releases/${TS_VERSION}/teamspeak3-server_lin tar -xjvf teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 cp -r teamspeak3-server_linux_amd64/* /mnt/server +cp -r /mnt/server/redist/* /mnt/server/ echo "machine_id= default_voice_port=${SERVER_PORT} From b08d6a4b9d52edbec4173febf6997fbdc5397e8a Mon Sep 17 00:00:00 2001 From: Anand Capur Date: Sat, 7 Oct 2017 14:45:31 -0700 Subject: [PATCH 2/3] Make config caching less aggressive --- .../Commands/Environment/AppSettingsCommand.php | 1 - .../Commands/Environment/DatabaseSettingsCommand.php | 1 - .../Commands/Environment/EmailSettingsCommand.php | 1 - composer.json | 12 ++---------- .../Environment/EmailSettingsCommandTest.php | 1 - 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php index d3e63af37..95591ac6f 100644 --- a/app/Console/Commands/Environment/AppSettingsCommand.php +++ b/app/Console/Commands/Environment/AppSettingsCommand.php @@ -114,7 +114,6 @@ class AppSettingsCommand extends Command $this->checkForRedis(); $this->writeToEnvironment($this->variables); - $this->command->call('config:cache'); $this->info($this->command->output()); } diff --git a/app/Console/Commands/Environment/DatabaseSettingsCommand.php b/app/Console/Commands/Environment/DatabaseSettingsCommand.php index d012971bd..f99c155be 100644 --- a/app/Console/Commands/Environment/DatabaseSettingsCommand.php +++ b/app/Console/Commands/Environment/DatabaseSettingsCommand.php @@ -122,7 +122,6 @@ class DatabaseSettingsCommand extends Command $this->writeToEnvironment($this->variables); - $this->console->call('config:cache'); $this->info($this->console->output()); return 0; diff --git a/app/Console/Commands/Environment/EmailSettingsCommand.php b/app/Console/Commands/Environment/EmailSettingsCommand.php index c5cb609b1..61b922b76 100644 --- a/app/Console/Commands/Environment/EmailSettingsCommand.php +++ b/app/Console/Commands/Environment/EmailSettingsCommand.php @@ -92,7 +92,6 @@ class EmailSettingsCommand extends Command $this->writeToEnvironment($this->variables); $this->line('Updating stored environment configuration file.'); - $this->call('config:cache'); $this->line(''); } diff --git a/composer.json b/composer.json index db04ade72..b0b0265bc 100644 --- a/composer.json +++ b/composer.json @@ -68,21 +68,13 @@ } }, "scripts": { - "pre-install-cmd": [ - "rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php" - ], - "pre-update-cmd": [ - "rm -f bootstrap/cache/services.php bootstrap/cache/compiled.php" - ], "post-install-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postInstall", - "php artisan optimize", - "php artisan config:cache" + "php artisan optimize" ], "post-update-cmd": [ "Illuminate\\Foundation\\ComposerScripts::postUpdate", - "php artisan optimize", - "php artisan config:cache" + "php artisan optimize" ] }, "prefer-stable": true, diff --git a/tests/Unit/Commands/Environment/EmailSettingsCommandTest.php b/tests/Unit/Commands/Environment/EmailSettingsCommandTest.php index ec8d943e9..1be2e50cb 100644 --- a/tests/Unit/Commands/Environment/EmailSettingsCommandTest.php +++ b/tests/Unit/Commands/Environment/EmailSettingsCommandTest.php @@ -276,6 +276,5 @@ class EmailSettingsCommandTest extends CommandTestCase { $this->config->shouldReceive('get')->withAnyArgs()->zeroOrMoreTimes()->andReturnNull(); $this->command->shouldReceive('writeToEnvironment')->with($data)->once()->andReturnNull(); - $this->command->shouldReceive('call')->with('config:cache')->once()->andReturnNull(); } } From b3fdf644354d2e3c8329d479639dd8aab8c54cb5 Mon Sep 17 00:00:00 2001 From: arioioio Date: Tue, 10 Oct 2017 03:13:52 +0700 Subject: [PATCH 3/3] Redirect to users list on user deletion (#680) closes #675 --- app/Http/Controllers/Admin/UserController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 4824cc9b2..5a1280aff 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -131,7 +131,7 @@ class UserController extends Controller $this->deletionService->handle($user); - return redirect()->route('admin.users.view', $user->id); + return redirect()->route('admin.users'); } /**