Merge branch 'develop' into feature/service-changes

database/migrations/2017_01_03_150436_fix_misnamed_option_tag.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+
+class FixMisnamedOptionTag extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::transaction(function () {
+            DB::table('service_options')->where([
+                ['name', 'Sponge (SpongeVanilla)'],
+                ['tag', 'spigot'],
+                ['docker_image', 'quay.io/pterodactyl/minecraft:sponge'],
+            ])->update([
+                'tag' => 'sponge',
+            ]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::table('service_options')->where([
+            ['name', 'Sponge (SpongeVanilla)'],
+            ['tag', 'sponge'],
+            ['docker_image', 'quay.io/pterodactyl/minecraft:sponge'],
+        ])->update([
+            'tag' => 'spigot',
+        ]);
+    }
+}

database/migrations/2017_01_07_154228_create_node_configuration_tokens_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateNodeConfigurationTokensTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('node_configuration_tokens', function (Blueprint $table) {
+            $table->increments('id');
+            $table->char('token', 32);
+            $table->timestamp('expires_at');
+            $table->integer('node')->unsigned();
+            $table->foreign('node')->references('id')->on('nodes');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('node_configuration_tokens');
+    }
+}