From 3b133c072b300a91df4355886ff7fd5d11c9ceb3 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 7 Mar 2018 00:15:26 -0500 Subject: [PATCH 1/4] factorio fixes --- Factorio/factorio/egg-factorio.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Factorio/factorio/egg-factorio.json b/Factorio/factorio/egg-factorio.json index a41ea09e..9ccb8595 100644 --- a/Factorio/factorio/egg-factorio.json +++ b/Factorio/factorio/egg-factorio.json @@ -3,21 +3,21 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2018-02-26T23:08:58-05:00", + "exported_at": "2018-03-07T00:13:07-05:00", "name": "Factorio", "author": "parker@parkervcp.com", "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/", "image": "quay.io\/pterodactyl\/core:glibc", "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --start-server {{SAVE_NAME}}.zip", "config": { - "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"game_password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"Type 'help' for a list of commands\",\r\n \"userInteraction\": []\r\n}", + "files": "{\r\n \"data\/server-settings.json\": {\r\n \"parser\": \"json\",\r\n \"find\": {\r\n \"password\": \"{{server.build.env.SERVER_PASS}}\",\r\n \"max_players\": \"{{server.build.env.MAX_SLOTS}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"Type changing state from(CreatingGame) to(InGame)\",\r\n \"userInteraction\": []\r\n}", "logs": "{\r\n \"custom\": false,\r\n \"location\": \"factorio-current.log\"\r\n}", "stop": "^C" }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n DL_VERSION=$latest_experimental\r\nelse\r\n DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\necho \"\\n running 'curl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\r\n\r\nmv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nmv data\/server-settings.example.json data\/server-settings.json\r\n\r\n.\/bin\/x64\/factorio --create ${SAVE_NAME}", + "script": "#!\/bin\/ash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl tar xz\r\n\r\nlatest_stable=`curl https:\/\/updater.factorio.com\/get-available-versions | grep stable | grep -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\nlatest_experimental=`curl https:\/\/www.factorio.com\/download-headless\/experimental | grep -m 1 -o -E '([0-9]\\.[0-9][0-9]\\.[0-9][0-9]|[0-9]\\.[0-9][0-9]\\.[0-9])'`\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n DL_VERSION=$latest_experimental\r\nelse\r\n DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\necho -e \"\\n running 'curl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz' \\n\"\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -L https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}.tar.gz\r\n\r\ntar -xf factorio-${DL_VERSION}.tar.gz --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}.tar.gz\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n echo \"map-gen exists\"\r\nelse\r\n echo \"copying map-gen default settings\"\r\n mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n echo \"server settings exists\"\r\nelse\r\n echo \"copying server default settings\"\r\n mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n echo \"map settings exists\"\r\nelse\r\n echo \"copying map default settings\"\r\n mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e ${SAVE_NAME}.zip ]; then\r\n echo \"save file exists\"\r\nelse\r\n .\/bin\/x64\/factorio --create ${SAVE_NAME}\r\n chmod o+w ${SAVE_NAME}.zip\r\nfi", "container": "frolvlad\/alpine-glibc", "entrypoint": "ash" } From 4d30cfefa59ac2c88f3132843bb619feb061389b Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Wed, 7 Mar 2018 08:52:04 -0500 Subject: [PATCH 2/4] Adding parkertron --- README.md | 4 ++++ discordbots/parkertron/egg-parkertron.json | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 discordbots/parkertron/egg-parkertron.json diff --git a/README.md b/README.md index dda79b80..6727f8a9 100644 --- a/README.md +++ b/README.md @@ -75,3 +75,7 @@ The [xonotic](http://www.xonotic.org/) official dedicated server. ### Discord #### ATLBot The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) + +#### parkertron +My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) + - Currently runs as the SupportBot in the pterodactyl discord server. \ No newline at end of file diff --git a/discordbots/parkertron/egg-parkertron.json b/discordbots/parkertron/egg-parkertron.json new file mode 100644 index 00000000..f96c2bf5 --- /dev/null +++ b/discordbots/parkertron/egg-parkertron.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2018-03-07T08:48:51-05:00", + "name": "parkertron", + "author": "parker@parkervcp.com", + "description": "The stupid chatbot parkertron by Parkervcp.\r\n\r\nhttps:\/\/github.com\/parkervcp\/parkertron", + "image": "quay.io\/parkervcp\/pterodactyl-images:parkertron", + "startup": ".\/parkertron", + "config": { + "files": "{}", + "startup": "{\r\n \"done\": \"Discord service connected\"\r\n}", + "logs": "{\r\n \"custom\": false,\r\n \"location\": \"logs\/info.log\"\r\n}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/ash\r\n# parkertron Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nexport GOPATH=$HOME\/go\r\nexport PATH=$GOROOT\/bin:$GOPATH\/bin:$PATH\r\n\r\ncd\r\n\r\nmkdir -p go\/bin go\/src\r\n\r\napk add --no-cache --update go git curl lua-stdlib lua musl-dev g++ libc-dev tesseract-ocr tesseract-ocr-dev\r\n\r\ncurl https:\/\/raw.githubusercontent.com\/golang\/dep\/master\/install.sh | sh\r\n\r\ncd go\/src\/\r\n\r\ngit clone -b pterodactyl https:\/\/github.com\/parkervcp\/parkertron.git\r\n\r\ncd parkertron\/\r\n\r\ndep ensure\r\n\r\ngo build \r\n\r\ncp parkertron \/mnt\/server\/\r\ncp -r configs\/ \/mnt\/server\/", + "container": "alpine:3.7", + "entrypoint": "ash" + } + }, + "variables": [] +} \ No newline at end of file From e0f0ed6564e6bbb11a873da5faf168de40ef3779 Mon Sep 17 00:00:00 2001 From: Aaronstar-McClure Date: Thu, 8 Mar 2018 10:38:31 -0500 Subject: [PATCH 3/4] updated the name on blightfall to be blightfall, not blightcraft --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6727f8a9..75ec01cd 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ Supply values to 2 variables to use #### Tekkit Packs ##### Hexxit [Hexxit](https://www.technicpack.net/modpack/hexxit.552552) -##### Blightcraft -[Blightcraft](https://www.technicpack.net/modpack/blightfall.592618) +##### Blightfall +[Blightfall](https://www.technicpack.net/modpack/blightfall.592618) ##### Tekkit-Legends [Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends.735902) @@ -78,4 +78,4 @@ The [ATLauncher Bot](https://github.com/ATLauncher/discord-bot/) #### parkertron My own stupid chat bot [parkertron](https://github.com/parkervcp/parkertron) - - Currently runs as the SupportBot in the pterodactyl discord server. \ No newline at end of file + - Currently runs as the SupportBot in the pterodactyl discord server. From 99550250c13c57fd57e15dca176015258092d285 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Fri, 9 Mar 2018 13:26:58 -0500 Subject: [PATCH 4/4] Update HOWTO.md --- HOWTO.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/HOWTO.md b/HOWTO.md index ef81930c..202b3ff2 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -2,12 +2,12 @@ ## General rules -1. Keep it simple. +1. Keep it simple. We don't need 8 miles of install script -2. Keep it Small. +2. Keep it Small. Only use what is absolutely needed. -3. Try to stay in the stock containers. - If you need something in a container PR it to [my container repo](https://github.com/parkervcp/Containers) where I can review and pull up to the main repo. +3. Try to stay in the stock containers. + If you need something in a container PR it to [my image repo](https://github.com/parkervcp/images) where I can review and pull up to the main repo. ## Step 1. #### Be aware of the pterodactyl install process. @@ -38,4 +38,4 @@ This is to maintain a clean repo that others can pull and be fully aware of what ## Step 3. #### Don't be afraid to submit PR's to the egg repo. -I dont bite. I will work with you on the egg and the required things to run it. \ No newline at end of file +I dont bite. I will work with you on the egg and the required things to run it.