From d58529428974db27ff0f3eab55ae5174c0608b32 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 12 Mar 2017 00:03:04 -0500 Subject: [PATCH] Misc. file removal and migration cleanup --- ...03_10_173607_MigrateToNewServiceSystem.php | 2 +- storage/app/services/index.js | 31 -------- storage/app/services/minecraft/main.json | 74 ------------------- storage/app/services/srcds/main.json | 23 ------ storage/app/services/terraria/main.json | 23 ------ storage/app/services/voice/main.json | 50 ------------- 6 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 storage/app/services/index.js delete mode 100644 storage/app/services/minecraft/main.json delete mode 100644 storage/app/services/srcds/main.json delete mode 100644 storage/app/services/terraria/main.json delete mode 100644 storage/app/services/voice/main.json diff --git a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php index afa9f6ee1..c22954150 100644 --- a/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php +++ b/database/migrations/2017_03_10_173607_MigrateToNewServiceSystem.php @@ -125,7 +125,7 @@ class MigrateToNewServiceSystem extends Migration switch($item->tag) { case 'source': - $item->config_startup = '{"done": "Assigned anonymous gameserver Steam ID", "userInteraction": []}'; + $item->config_startup = '{"done": "Assigned anonymous gameserver", "userInteraction": []}'; $item->config_files = '{}'; $item->config_logs = '{"custom": true, "location": "logs/latest.log"}'; $item->config_stop = 'quit'; diff --git a/storage/app/services/index.js b/storage/app/services/index.js deleted file mode 100644 index f6b6695d0..000000000 --- a/storage/app/services/index.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict'; - -/** - * Pterodactyl - Daemon - * Copyright (c) 2015 - 2017 Dane Everitt - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -const rfr = require('rfr'); - -const Core = rfr('src/services/index.js'); - -class Service extends Core {} - -module.exports = Service; diff --git a/storage/app/services/minecraft/main.json b/storage/app/services/minecraft/main.json deleted file mode 100644 index 48a490cb3..000000000 --- a/storage/app/services/minecraft/main.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "vanilla": { - "startup": { - "done": ")! For help, type ", - "userInteraction": [ - "Go to eula.txt for more info." - ] - }, - "stop": "stop", - "configs": { - "server.properties": { - "parser": "properties", - "find": { - "server-ip": "0.0.0.0", - "enable-query": "true", - "server-port": "{{ server.build.default.port }}", - "query.port": "{{ server.build.default.port }}" - } - } - }, - "log": { - "custom": false, - "location": "logs/latest.log" - }, - "query": "minecraftping" - }, - "spigot": { - "symlink": "vanilla", - "configs": { - "spigot.yml": { - "parser": "yaml", - "find": { - "settings.restart-on-crash": "false" - } - } - } - }, - "bungeecord": { - "startup": { - "done": "Listening on ", - "userInteraction": [ - "Listening on /0.0.0.0:25577" - ] - }, - "stop": "end", - "configs": { - "config.yml": { - "parser": "yaml", - "find": { - "listeners[0].query_enabled": true, - "listeners[0].query_port": "{{ server.build.default.port }}", - "listeners[0].host": "0.0.0.0:{{ server.build.default.port }}", - "servers.*.address": { - "127.0.0.1": "{{ config.docker.interface }}", - "localhost": "{{ config.docker.interface }}" - } - } - } - }, - "log": { - "custom": false, - "location": "proxy.log.0" - }, - "query": "minecraftping" - }, - "sponge": { - "symlink": "vanilla", - "startup": { - "userInteraction": [ - "You need to agree to the EULA" - ] - } - } -} diff --git a/storage/app/services/srcds/main.json b/storage/app/services/srcds/main.json deleted file mode 100644 index 989a67537..000000000 --- a/storage/app/services/srcds/main.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "srcds": { - "startup": { - "done": "Assigned anonymous gameserver Steam ID", - "userInteraction": [] - }, - "stop": "quit", - "configs": {}, - "log": { - "custom": true, - "location": "logs/latest.log" - }, - "query": "protocol-valve" - }, - "ark": { - "symlink": "srcds", - "startup": { - "done": "Setting breakpad minidump AppID" - }, - "stop": "^C", - "query": "none" - } -} diff --git a/storage/app/services/terraria/main.json b/storage/app/services/terraria/main.json deleted file mode 100644 index 78f1b5bc0..000000000 --- a/storage/app/services/terraria/main.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "tshock": { - "startup": { - "done": "Type 'help' for a list of commands", - "userInteraction": [] - }, - "stop": "exit", - "configs": { - "tshock/config.json": { - "parser": "json", - "find": { - "ServerPort": "{{ server.build.default.port }}", - "MaxSlots": "{{ server.build.env.MAX_SLOTS }}" - } - } - }, - "log": { - "custom": false, - "location": "ServerLog.txt" - }, - "query": "none" - } -} diff --git a/storage/app/services/voice/main.json b/storage/app/services/voice/main.json deleted file mode 100644 index bc7232f46..000000000 --- a/storage/app/services/voice/main.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "mumble": { - "startup": { - "done": "Server listening on", - "userInteraction": [ - "Generating new server certificate" - ] - }, - "stop": "^C", - "configs": { - "murmur.ini": { - "parser": "ini", - "find": { - "logfile": "murmur.log", - "port": "{{ server.build.default.port }}", - "host": "0.0.0.0", - "users": "{{ server.build.env.MAX_USERS }}" - } - } - }, - "log": { - "custom": true, - "location": "logs/murmur.log" - }, - "query": "mumbleping" - }, - "ts3": { - "startup": { - "done": "listening on 0.0.0.0:", - "userInteraction": [] - }, - "stop": "^C", - "configs": { - "ts3server.ini": { - "parser": "ini", - "find": { - "default_voice_port": "{{ server.build.default.port }}", - "voice_ip": "0.0.0.0", - "query_port": "{{ server.build.default.port }}", - "query_ip": "0.0.0.0" - } - } - }, - "log": { - "custom": true, - "location": "logs/ts3.log" - }, - "query": "none" - } -}