Apply fixes from StyleCI
This commit is contained in:
Dane Everitt
StyleCI Bot
parent
a1d3bbf73d
commit
c1fb0a665f
150 changed files with 1558 additions and 1760 deletions
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -21,9 +21,8 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class MinecraftServiceTableSeeder extends Seeder
|
||||
{
|
||||
|
|
@ -35,7 +34,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
protected $service;
|
||||
|
||||
/**
|
||||
* Stores all of the option objects
|
||||
* Stores all of the option objects.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
|
|
@ -61,7 +60,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'description' => 'Minecraft - the classic game from Mojang. With support for Vanilla MC, Spigot, and many others!',
|
||||
'file' => 'minecraft',
|
||||
'executable' => 'java',
|
||||
'startup' => '-Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}'
|
||||
'startup' => '-Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +73,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'tag' => 'vanilla',
|
||||
'docker_image' => 'quay.io/pterodactyl/minecraft',
|
||||
'executable' => null,
|
||||
'startup' => null
|
||||
'startup' => null,
|
||||
]);
|
||||
|
||||
$this->option['spigot'] = Models\ServiceOptions::create([
|
||||
|
|
@ -84,7 +83,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'tag' => 'spigot',
|
||||
'docker_image' => 'quay.io/pterodactyl/minecraft:spigot',
|
||||
'executable' => null,
|
||||
'startup' => '-Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}'
|
||||
'startup' => '-Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}',
|
||||
]);
|
||||
|
||||
$this->option['sponge'] = Models\ServiceOptions::create([
|
||||
|
|
@ -94,7 +93,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'tag' => 'spigot',
|
||||
'docker_image' => 'quay.io/pterodactyl/minecraft:sponge',
|
||||
'executable' => null,
|
||||
'startup' => null
|
||||
'startup' => null,
|
||||
]);
|
||||
|
||||
$this->option['bungeecord'] = Models\ServiceOptions::create([
|
||||
|
|
@ -104,7 +103,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'tag' => 'bungeecord',
|
||||
'docker_image' => 'quay.io/pterodactyl/minecraft:bungeecord',
|
||||
'executable' => null,
|
||||
'startup' => null
|
||||
'startup' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -127,7 +126,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/'
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -139,7 +138,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(latest|[a-zA-Z0-9_\.-]{3,7})$/'
|
||||
'regex' => '/^(latest|[a-zA-Z0-9_\.-]{3,7})$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -154,7 +153,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/'
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -166,7 +165,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(latest|[a-zA-Z0-9_\.-]{3,7})$/'
|
||||
'regex' => '/^(latest|[a-zA-Z0-9_\.-]{3,7})$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -178,7 +177,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 0,
|
||||
'user_editable' => 0,
|
||||
'required' => 0,
|
||||
'regex' => '/^(.*)$/'
|
||||
'regex' => '/^(.*)$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -193,7 +192,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^([a-zA-Z0-9.\-_]+)$/'
|
||||
'regex' => '/^([a-zA-Z0-9.\-_]+)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -205,7 +204,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/'
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +219,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(latest|[\d]{1,6})$/'
|
||||
'regex' => '/^(latest|[\d]{1,6})$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -232,7 +231,7 @@ class MinecraftServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/'
|
||||
'regex' => '/^([\w\d._-]+)(\.jar)$/',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -21,9 +21,8 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class SourceServiceTableSeeder extends Seeder
|
||||
{
|
||||
|
|
@ -35,7 +34,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
protected $service;
|
||||
|
||||
/**
|
||||
* Stores all of the option objects
|
||||
* Stores all of the option objects.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
|
|
@ -61,7 +60,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'description' => 'Includes support for most Source Dedicated Server games.',
|
||||
'file' => 'srcds',
|
||||
'executable' => './srcds_run',
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} -strictportbind -norestart'
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} -strictportbind -norestart',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +73,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'tag' => 'srcds',
|
||||
'docker_image' => 'quay.io/pterodactyl/srcds',
|
||||
'executable' => null,
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} -strictportbind -norestart'
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} -strictportbind -norestart',
|
||||
]);
|
||||
|
||||
$this->option['tf2'] = Models\ServiceOptions::create([
|
||||
|
|
@ -84,7 +83,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'tag' => 'srcds',
|
||||
'docker_image' => 'quay.io/pterodactyl/srcds',
|
||||
'executable' => null,
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} -strictportbind -norestart'
|
||||
'startup' => '-game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} -strictportbind -norestart',
|
||||
]);
|
||||
|
||||
$this->option['ark'] = Models\ServiceOptions::create([
|
||||
|
|
@ -94,7 +93,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'tag' => 'ark',
|
||||
'docker_image' => 'quay.io/pterodactyl/srcds:ark',
|
||||
'executable' => './ShooterGameServer',
|
||||
'startup' => 'TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}'
|
||||
'startup' => 'TheIsland?listen?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?MaxPlayers={{SERVER_MAX_PLAYERS}}',
|
||||
]);
|
||||
|
||||
$this->option['custom'] = Models\ServiceOptions::create([
|
||||
|
|
@ -104,7 +103,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'tag' => 'srcds',
|
||||
'docker_image' => 'quay.io/pterodactyl/srcds',
|
||||
'executable' => null,
|
||||
'startup' => null
|
||||
'startup' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -127,7 +126,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(17705)$/'
|
||||
'regex' => '/^(17705)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -139,7 +138,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(insurgency)$/'
|
||||
'regex' => '/^(insurgency)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -151,7 +150,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\w{1,20})$/'
|
||||
'regex' => '/^(\w{1,20})$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -166,7 +165,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(232250)$/'
|
||||
'regex' => '/^(232250)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -178,7 +177,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(tf)$/'
|
||||
'regex' => '/^(tf)$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -190,7 +189,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\w{1,20})$/'
|
||||
'regex' => '/^(\w{1,20})$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -205,7 +204,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 0,
|
||||
'regex' => '/^(\w\.*)$/'
|
||||
'regex' => '/^(\w\.*)$/',
|
||||
]);
|
||||
|
||||
DB::table('service_variables')->insert([
|
||||
|
|
@ -217,7 +216,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 0,
|
||||
'regex' => '/^(\w\.*)$/'
|
||||
'regex' => '/^(\w\.*)$/',
|
||||
]);
|
||||
|
||||
DB::table('service_variables')->insert([
|
||||
|
|
@ -229,7 +228,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\d{1,4})$/'
|
||||
'regex' => '/^(\d{1,4})$/',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -244,7 +243,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\d){1,6}$/'
|
||||
'regex' => '/^(\d){1,6}$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -256,7 +255,7 @@ class SourceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(.*)$/'
|
||||
'regex' => '/^(.*)$/',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -21,9 +21,8 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class TerrariaServiceTableSeeder extends Seeder
|
||||
{
|
||||
|
|
@ -35,7 +34,7 @@ class TerrariaServiceTableSeeder extends Seeder
|
|||
protected $service;
|
||||
|
||||
/**
|
||||
* Stores all of the option objects
|
||||
* Stores all of the option objects.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
|
|
@ -61,7 +60,7 @@ class TerrariaServiceTableSeeder extends Seeder
|
|||
'description' => 'Terraria is a land of adventure! A land of mystery! A land that\'s yours to shape, defend, and enjoy. Your options in Terraria are limitless. Are you an action gamer with an itchy trigger finger? A master builder? A collector? An explorer? There\'s something for everyone.',
|
||||
'file' => 'terraria',
|
||||
'executable' => 'TerrariaServer.exe',
|
||||
'startup' => '-port {{SERVER_PORT}} -autocreate 2 -worldname World'
|
||||
'startup' => '-port {{SERVER_PORT}} -autocreate 2 -worldname World',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +73,7 @@ class TerrariaServiceTableSeeder extends Seeder
|
|||
'tag' => 'tshock',
|
||||
'docker_image' => 'quay.io/pterodactyl/terraria:tshock',
|
||||
'executable' => '',
|
||||
'startup' => ''
|
||||
'startup' => '',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -89,7 +88,7 @@ class TerrariaServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([0-9_\.-]{5,10})$/'
|
||||
'regex' => '/^([0-9_\.-]{5,10})$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -101,7 +100,7 @@ class TerrariaServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\d){1,3}$/'
|
||||
'regex' => '/^(\d){1,3}$/',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -21,9 +21,8 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
use Pterodactyl\Models;
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class VoiceServiceTableSeeder extends Seeder
|
||||
{
|
||||
|
|
@ -35,7 +34,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
protected $service;
|
||||
|
||||
/**
|
||||
* Stores all of the option objects
|
||||
* Stores all of the option objects.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
|
|
@ -61,7 +60,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'description' => 'Voice servers such as Mumble and Teamspeak 3.',
|
||||
'file' => 'voice',
|
||||
'executable' => '',
|
||||
'startup' => ''
|
||||
'startup' => '',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +73,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'tag' => 'mumble',
|
||||
'docker_image' => 'quay.io/pterodactyl/voice:mumble',
|
||||
'executable' => './murmur.x86',
|
||||
'startup' => '-fg'
|
||||
'startup' => '-fg',
|
||||
]);
|
||||
|
||||
$this->option['ts3'] = Models\ServiceOptions::create([
|
||||
|
|
@ -84,7 +83,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'tag' => 'ts3',
|
||||
'docker_image' => 'quay.io/pterodactyl/voice:ts3',
|
||||
'executable' => './ts3server_minimal_runscript.sh',
|
||||
'startup' => 'default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}}'
|
||||
'startup' => 'default_voice_port={{SERVER_PORT}} query_port={{SERVER_PORT}}',
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -99,7 +98,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 0,
|
||||
'required' => 1,
|
||||
'regex' => '/^(\d){1,6}$/'
|
||||
'regex' => '/^(\d){1,6}$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -111,7 +110,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([0-9_\.-]{5,8})$/'
|
||||
'regex' => '/^([0-9_\.-]{5,8})$/',
|
||||
]);
|
||||
|
||||
Models\ServiceVariables::create([
|
||||
|
|
@ -123,7 +122,7 @@ class VoiceServiceTableSeeder extends Seeder
|
|||
'user_viewable' => 1,
|
||||
'user_editable' => 1,
|
||||
'required' => 1,
|
||||
'regex' => '/^([0-9_\.-]{5,10})$/'
|
||||
'regex' => '/^([0-9_\.-]{5,10})$/',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue