From d4e8d314c5278203156e977e176a59387ba310c6 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 29 Jun 2020 17:11:32 -0400 Subject: [PATCH 01/23] update discordjs generic update generic install script update generic start command --- .../discord.js/egg-discord-js-generic.json | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index a10e1502..b63e19a7 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-03-26T16:10:33+01:00", + "exported_at": "2020-06-29T17:10:31-04:00", "name": "discord.js generic", "author": "parker@parkervcp.com", "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi && \/usr\/local\/bin\/npm install --production && \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/usr\/local\/bin\/node\/home\/container\/{{BOT_JS_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#\/bin\/ash\r\n\r\napk add --no-cache git make gcc g++ python\r\n\r\ncd \/mnt\/server\r\n\r\nif [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\nfi\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\t\techo -e \"updating local npm modules\"\r\n\t\t\t\/usr\/local\/bin\/npm install --production\r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\t\techo -e \"install npm modules locally\"\r\n\t\t\/usr\/local\/bin\/npm install --production\r\n\tfi\r\nfi \r\n\r\necho -e \"install complete\"\r\nexit 0", - "container": "node:10-alpine", - "entrypoint": "ash" + "script": "#!\/bin\/bash\r\n# NodeJS Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git make gcc g++ python python-dev libtool\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\nfi\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\tfi\r\nfi \r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${NODE_PACKAGES} ]]; then\r\n \/usr\/local\/bin\/npm install ${NODE_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/package.json ]; then\r\n \/usr\/local\/bin\/npm install --production\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "container": "node:12-buster-slim", + "entrypoint": "bash" } }, "variables": [ @@ -67,6 +67,15 @@ "user_viewable": 1, "user_editable": 1, "rules": "required|string" + }, + { + "name": "Additional Node packages", + "description": "Install additional node packages.\r\n\r\nUse spaces to separate", + "env_variable": "NODE_PACKAGES", + "default_value": "", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" } ] -} +} \ No newline at end of file From 9e60f984fd286faf9291bf60f47e6f694dbd7e27 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 26 Jun 2020 10:52:37 -0400 Subject: [PATCH 02/23] reorg folders --- README.md | 66 +++++++++---------- database/{ => sql}/postgres/README.md | 0 database/{ => sql}/postgres/egg-postgres.json | 0 database/{ => sql/postgres}/mariadb/README.md | 0 .../postgres}/mariadb/egg-maria-d-b.json | 0 .../{ => sql/postgres}/mariadb/install.my.cnf | 0 database/{ => sql/postgres}/mariadb/my.cnf | 0 database/{ => sql}/postgres/postgres.conf | 0 .../waterfall => minecraft}/README.md | 0 .../bedrock}/README.md | 0 .../bedrock}/bedrock/README.md | 0 .../bedrock}/bedrock/egg-vanilla-bedrock.json | 0 .../bedrock}/dragon_proxy/README.md | 0 .../dragon_proxy/egg-dragon-proxy.json | 0 .../bedrock}/nukkit/egg-nukkit.json | 0 .../bedrock}/nukkit/nukkit.yml | 0 .../bedrock}/nukkit/server.properties | 0 .../pocketmine_mp/egg-pocketmine-m-p.json | 0 .../bedrock}/pocketmine_mp/server.properties | 0 {minecraft_java => minecraft/java}/README.md | 0 .../java}/cuberite/README.md | 0 .../java}/cuberite/egg-cuberite.json | 0 .../java}/cuberite/settings.ini | 0 .../java}/cuberite/webadmin.ini | 0 .../java}/feather/README.md | 0 .../java}/feather/egg-feather.json | 0 .../java}/feather/feather.toml | 0 .../java}/forge/curseforge-generic/README.md | 0 .../egg-curseforge-generic.json | 0 .../java}/forge/forge/README.md | 0 .../java}/forge/forge/egg-forge-enhanced.json | 0 .../feed-the-beast/egg-feed-the-beast.json | 0 .../ftb-revelation/egg-f-t-b-revelation.json | 0 .../java}/magma/README.md | 0 .../java}/magma/egg-magma.json | 0 .../java}/paper/README.MD | 0 .../java}/paper/egg-paper.json | 0 .../java}/server.properties | 0 .../java}/spigot/README.MD | 0 .../java}/spigot/egg-spigot.json | 0 .../java}/spongeforge/README.MD | 0 .../java}/spongeforge/egg-sponge-forge.json | 0 .../java}/spongevanilla/README.MD | 0 .../spongevanilla/egg-sponge-vanilla.json | 0 .../java}/technic/README.md | 0 .../technic/attack-of-the-bteam/README.MD | 0 .../egg-attack-of-the-b--team.json | 0 .../technic/blightfall/egg-blightfall.json | 0 .../java}/technic/hexxit/egg-hexxit.json | 0 .../tekkit-classic/egg-tekkit-classic.json | 0 .../tekkit-legends/egg-tekkit-legends.json | 0 .../java}/technic/the-1-7-10-pack/README.MD | 0 .../the-1-7-10-pack/egg-the1-7-10-pack.json | 0 .../java}/tuinity/.gitignore | 0 .../java}/tuinity/egg-tuinity.json | 0 .../java}/vanillacord/README.md | 0 .../java}/vanillacord/egg-vanilla-cord.json | 0 .../proxy}/typhoonlimbo/README.md | 0 .../typhoonlimbo/egg-typhoon-limbo.json | 0 .../proxy}/velocity/README.md | 0 .../proxy}/velocity/egg-velocity.json | 0 .../proxy}/velocity/velocity.toml | 0 minecraft/proxy/waterfall/README.md | 0 .../proxy}/waterfall/config.yml | 0 .../proxy}/waterfall/egg-waterfall.json | 0 .../rocketmod/egg-rocket-mod-modern.json | 0 .../rocketmod/egg-rocketmod-old.json | 0 .../unturned/rocketmod/egg-rocketmod.json | 54 --------------- 68 files changed, 33 insertions(+), 87 deletions(-) rename database/{ => sql}/postgres/README.md (100%) rename database/{ => sql}/postgres/egg-postgres.json (100%) rename database/{ => sql/postgres}/mariadb/README.md (100%) rename database/{ => sql/postgres}/mariadb/egg-maria-d-b.json (100%) rename database/{ => sql/postgres}/mariadb/install.my.cnf (100%) rename database/{ => sql/postgres}/mariadb/my.cnf (100%) rename database/{ => sql}/postgres/postgres.conf (100%) rename {minecraft_proxy/waterfall => minecraft}/README.md (100%) rename {minecraft_bedrock => minecraft/bedrock}/README.md (100%) rename {minecraft_bedrock => minecraft/bedrock}/bedrock/README.md (100%) rename {minecraft_bedrock => minecraft/bedrock}/bedrock/egg-vanilla-bedrock.json (100%) rename {minecraft_bedrock => minecraft/bedrock}/dragon_proxy/README.md (100%) rename {minecraft_bedrock => minecraft/bedrock}/dragon_proxy/egg-dragon-proxy.json (100%) rename {minecraft_bedrock => minecraft/bedrock}/nukkit/egg-nukkit.json (100%) rename {minecraft_bedrock => minecraft/bedrock}/nukkit/nukkit.yml (100%) rename {minecraft_bedrock => minecraft/bedrock}/nukkit/server.properties (100%) rename {minecraft_bedrock => minecraft/bedrock}/pocketmine_mp/egg-pocketmine-m-p.json (100%) rename {minecraft_bedrock => minecraft/bedrock}/pocketmine_mp/server.properties (100%) rename {minecraft_java => minecraft/java}/README.md (100%) rename {minecraft_java => minecraft/java}/cuberite/README.md (100%) rename {minecraft_java => minecraft/java}/cuberite/egg-cuberite.json (100%) rename {minecraft_java => minecraft/java}/cuberite/settings.ini (100%) rename {minecraft_java => minecraft/java}/cuberite/webadmin.ini (100%) rename {minecraft_java => minecraft/java}/feather/README.md (100%) rename {minecraft_java => minecraft/java}/feather/egg-feather.json (100%) rename {minecraft_java => minecraft/java}/feather/feather.toml (100%) rename {minecraft_java => minecraft/java}/forge/curseforge-generic/README.md (100%) rename {minecraft_java => minecraft/java}/forge/curseforge-generic/egg-curseforge-generic.json (100%) rename {minecraft_java => minecraft/java}/forge/forge/README.md (100%) rename {minecraft_java => minecraft/java}/forge/forge/egg-forge-enhanced.json (100%) rename {minecraft_java => minecraft/java}/ftb/feed-the-beast/egg-feed-the-beast.json (100%) rename {minecraft_java => minecraft/java}/ftb/ftb-revelation/egg-f-t-b-revelation.json (100%) rename {minecraft_java => minecraft/java}/magma/README.md (100%) rename {minecraft_java => minecraft/java}/magma/egg-magma.json (100%) rename {minecraft_java => minecraft/java}/paper/README.MD (100%) rename {minecraft_java => minecraft/java}/paper/egg-paper.json (100%) rename {minecraft_java => minecraft/java}/server.properties (100%) rename {minecraft_java => minecraft/java}/spigot/README.MD (100%) rename {minecraft_java => minecraft/java}/spigot/egg-spigot.json (100%) rename {minecraft_java => minecraft/java}/spongeforge/README.MD (100%) rename {minecraft_java => minecraft/java}/spongeforge/egg-sponge-forge.json (100%) rename {minecraft_java => minecraft/java}/spongevanilla/README.MD (100%) rename {minecraft_java => minecraft/java}/spongevanilla/egg-sponge-vanilla.json (100%) rename {minecraft_java => minecraft/java}/technic/README.md (100%) rename {minecraft_java => minecraft/java}/technic/attack-of-the-bteam/README.MD (100%) rename {minecraft_java => minecraft/java}/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json (100%) rename {minecraft_java => minecraft/java}/technic/blightfall/egg-blightfall.json (100%) rename {minecraft_java => minecraft/java}/technic/hexxit/egg-hexxit.json (100%) rename {minecraft_java => minecraft/java}/technic/tekkit-classic/egg-tekkit-classic.json (100%) rename {minecraft_java => minecraft/java}/technic/tekkit-legends/egg-tekkit-legends.json (100%) rename {minecraft_java => minecraft/java}/technic/the-1-7-10-pack/README.MD (100%) rename {minecraft_java => minecraft/java}/technic/the-1-7-10-pack/egg-the1-7-10-pack.json (100%) rename {minecraft_java => minecraft/java}/tuinity/.gitignore (100%) rename {minecraft_java => minecraft/java}/tuinity/egg-tuinity.json (100%) rename {minecraft_java => minecraft/java}/vanillacord/README.md (100%) rename {minecraft_java => minecraft/java}/vanillacord/egg-vanilla-cord.json (100%) rename {minecraft_proxy => minecraft/proxy}/typhoonlimbo/README.md (100%) rename {minecraft_proxy => minecraft/proxy}/typhoonlimbo/egg-typhoon-limbo.json (100%) rename {minecraft_proxy => minecraft/proxy}/velocity/README.md (100%) rename {minecraft_proxy => minecraft/proxy}/velocity/egg-velocity.json (100%) rename {minecraft_proxy => minecraft/proxy}/velocity/velocity.toml (100%) create mode 100644 minecraft/proxy/waterfall/README.md rename {minecraft_proxy => minecraft/proxy}/waterfall/config.yml (100%) rename {minecraft_proxy => minecraft/proxy}/waterfall/egg-waterfall.json (100%) rename {unturned => steamcmd_servers/unturned}/rocketmod/egg-rocket-mod-modern.json (100%) rename {unturned => steamcmd_servers/unturned}/rocketmod/egg-rocketmod-old.json (100%) delete mode 100644 steamcmd_servers/unturned/rocketmod/egg-rocketmod.json diff --git a/README.md b/README.md index 5dcdcd72..e7cbff98 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you are reading this it looks like you are looking to add an egg to your serv ## Please read the CONTRIBUTING.md before submitting PRs -## Bot Eggs +## [Bots](/bots/) [Discord](/bots/discord/) * [ATL Bot](/bots/discord/atlbot/) Node JS @@ -39,19 +39,19 @@ If you are reading this it looks like you are looking to add an egg to your serv * [Red](/bots/discord/redbot/) Python * [Sinusbot](/bots/discord/sinusbot/) -[Twitch](/bots/twitch) -* [PhantomBot](/bots/twitch/phantombot/) +* [Twitch](/bots/twitch) + * [PhantomBot](/bots/twitch/phantombot/) -[TeamSpeak3](bots/teamspeak3) -* [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) +* [TeamSpeak3](bots/teamspeak3) + * [JTS3ServerMod](/bots/teamspeak3/jts3servermod/) -## Database Eggs -### SQL Databases -[MariaDB](/database/mariadb/) -[PostgreSQL](/database/postgres/) +## [Database](/database/) +### [SQL] Databases +* [MariaDB](/database/sql/mariadb/) +* [PostgreSQL](/database/sql/postgres/) ### In-Memory Databases -[Redis](/database/redis/) +* [Redis](/database/redis/) ## Game Eggs [ET Legacy](/enemy_territory/etlegacy/) @@ -69,31 +69,31 @@ If you are reading this it looks like you are looking to add an egg to your serv [Mindusrty](/mindustry/) -[Minecraft Bedrock](/minecraft_bedrock/) -* [Bedrock](/minecraft_bedrock/bedrock/) -* [DragonProxy](/minecraft_bedrock/dragonproxy/) -* [Nukkit](/minecraft_bedrock/nukkit/) -* [PocketMine MP](/minecraft_bedrock/pocketmine_mp/) +[Minecraft](/minecraft/) +* [Bedrock](/minecraft/bedrock/) + * [Bedrock](/minecraft/bedrock/bedrock/) + * [DragonProxy](/minecraft/bedrock/dragonproxy/) + * [Nukkit](/minecraft/bedrock/nukkit/) + * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) -[Minecraft Java](/minecraft_java/) Servers for Java Minecraft -* [Cuberite](/minecraft_java/cuberite/) -* [feather](/minecraft/feather/) -* [Feed The Beast](/minecraft_java/ftb/) -* [Forge](/minecraft_java/forge/) -* [Magma](/minecraft_java/magma/) +* [Java](/minecraft/java/) Servers for Java Minecraft + * [Cuberite](/minecraft/java/cuberite/) + * [feather](/minecraft/feather/) + * [Feed The Beast](/minecraft/java/ftb/) + * [Forge](/minecraft/java/forge/) + * [Magma](/minecraft/java/magma/) + * [Paper](/minecraft/java/paper) + * [Spigot](/minecraft/java/spigot/) + * [spongeforge](/minecraft/java/spongeforge/) + * [SpongeVanilla](/minecraft/java/spongevanilla/) + * [Technic](/minecraft/java/technic/) + * [Tuinity](/minecraft/java/tuinity/) + * [VanillaCord](/minecraft/java/vanillacord/) -* [Paper](/minecraft_java/paper) -* [Spigot](/minecraft_java/spigot/) -* [spongeforge](/minecraft_java/spongeforge/) -* [SpongeVanilla](/minecraft_java/spongevanilla/) -* [Technic](/minecraft_java/technic/) -* [VanillaCord](/minecraft_java/vanillacord/) -* [Tuinity](/minecraft_java/tuinity/) - -[Minecraft Proxies](/minecraft_proxy/) (these are for the java version of minecraft) -* [Waterfall](/minecraft_proxy/waterfall/) -* [TyphoonLimbo](/minecraft_proxy/typhoonlimbo/) -* [Velocity](/minecraft_proxy/velocity/) +* [Proxies](/minecraft/proxy/) (these are for the java version of minecraft) + * [Waterfall](/minecraft/proxy/waterfall/) + * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) + * [Velocity](/minecraft/proxy/velocity/) [Red Dead Redemption](/rdr/) * [RedM](/rdr/redm/) diff --git a/database/postgres/README.md b/database/sql/postgres/README.md similarity index 100% rename from database/postgres/README.md rename to database/sql/postgres/README.md diff --git a/database/postgres/egg-postgres.json b/database/sql/postgres/egg-postgres.json similarity index 100% rename from database/postgres/egg-postgres.json rename to database/sql/postgres/egg-postgres.json diff --git a/database/mariadb/README.md b/database/sql/postgres/mariadb/README.md similarity index 100% rename from database/mariadb/README.md rename to database/sql/postgres/mariadb/README.md diff --git a/database/mariadb/egg-maria-d-b.json b/database/sql/postgres/mariadb/egg-maria-d-b.json similarity index 100% rename from database/mariadb/egg-maria-d-b.json rename to database/sql/postgres/mariadb/egg-maria-d-b.json diff --git a/database/mariadb/install.my.cnf b/database/sql/postgres/mariadb/install.my.cnf similarity index 100% rename from database/mariadb/install.my.cnf rename to database/sql/postgres/mariadb/install.my.cnf diff --git a/database/mariadb/my.cnf b/database/sql/postgres/mariadb/my.cnf similarity index 100% rename from database/mariadb/my.cnf rename to database/sql/postgres/mariadb/my.cnf diff --git a/database/postgres/postgres.conf b/database/sql/postgres/postgres.conf similarity index 100% rename from database/postgres/postgres.conf rename to database/sql/postgres/postgres.conf diff --git a/minecraft_proxy/waterfall/README.md b/minecraft/README.md similarity index 100% rename from minecraft_proxy/waterfall/README.md rename to minecraft/README.md diff --git a/minecraft_bedrock/README.md b/minecraft/bedrock/README.md similarity index 100% rename from minecraft_bedrock/README.md rename to minecraft/bedrock/README.md diff --git a/minecraft_bedrock/bedrock/README.md b/minecraft/bedrock/bedrock/README.md similarity index 100% rename from minecraft_bedrock/bedrock/README.md rename to minecraft/bedrock/bedrock/README.md diff --git a/minecraft_bedrock/bedrock/egg-vanilla-bedrock.json b/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json similarity index 100% rename from minecraft_bedrock/bedrock/egg-vanilla-bedrock.json rename to minecraft/bedrock/bedrock/egg-vanilla-bedrock.json diff --git a/minecraft_bedrock/dragon_proxy/README.md b/minecraft/bedrock/dragon_proxy/README.md similarity index 100% rename from minecraft_bedrock/dragon_proxy/README.md rename to minecraft/bedrock/dragon_proxy/README.md diff --git a/minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json similarity index 100% rename from minecraft_bedrock/dragon_proxy/egg-dragon-proxy.json rename to minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json diff --git a/minecraft_bedrock/nukkit/egg-nukkit.json b/minecraft/bedrock/nukkit/egg-nukkit.json similarity index 100% rename from minecraft_bedrock/nukkit/egg-nukkit.json rename to minecraft/bedrock/nukkit/egg-nukkit.json diff --git a/minecraft_bedrock/nukkit/nukkit.yml b/minecraft/bedrock/nukkit/nukkit.yml similarity index 100% rename from minecraft_bedrock/nukkit/nukkit.yml rename to minecraft/bedrock/nukkit/nukkit.yml diff --git a/minecraft_bedrock/nukkit/server.properties b/minecraft/bedrock/nukkit/server.properties similarity index 100% rename from minecraft_bedrock/nukkit/server.properties rename to minecraft/bedrock/nukkit/server.properties diff --git a/minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json similarity index 100% rename from minecraft_bedrock/pocketmine_mp/egg-pocketmine-m-p.json rename to minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json diff --git a/minecraft_bedrock/pocketmine_mp/server.properties b/minecraft/bedrock/pocketmine_mp/server.properties similarity index 100% rename from minecraft_bedrock/pocketmine_mp/server.properties rename to minecraft/bedrock/pocketmine_mp/server.properties diff --git a/minecraft_java/README.md b/minecraft/java/README.md similarity index 100% rename from minecraft_java/README.md rename to minecraft/java/README.md diff --git a/minecraft_java/cuberite/README.md b/minecraft/java/cuberite/README.md similarity index 100% rename from minecraft_java/cuberite/README.md rename to minecraft/java/cuberite/README.md diff --git a/minecraft_java/cuberite/egg-cuberite.json b/minecraft/java/cuberite/egg-cuberite.json similarity index 100% rename from minecraft_java/cuberite/egg-cuberite.json rename to minecraft/java/cuberite/egg-cuberite.json diff --git a/minecraft_java/cuberite/settings.ini b/minecraft/java/cuberite/settings.ini similarity index 100% rename from minecraft_java/cuberite/settings.ini rename to minecraft/java/cuberite/settings.ini diff --git a/minecraft_java/cuberite/webadmin.ini b/minecraft/java/cuberite/webadmin.ini similarity index 100% rename from minecraft_java/cuberite/webadmin.ini rename to minecraft/java/cuberite/webadmin.ini diff --git a/minecraft_java/feather/README.md b/minecraft/java/feather/README.md similarity index 100% rename from minecraft_java/feather/README.md rename to minecraft/java/feather/README.md diff --git a/minecraft_java/feather/egg-feather.json b/minecraft/java/feather/egg-feather.json similarity index 100% rename from minecraft_java/feather/egg-feather.json rename to minecraft/java/feather/egg-feather.json diff --git a/minecraft_java/feather/feather.toml b/minecraft/java/feather/feather.toml similarity index 100% rename from minecraft_java/feather/feather.toml rename to minecraft/java/feather/feather.toml diff --git a/minecraft_java/forge/curseforge-generic/README.md b/minecraft/java/forge/curseforge-generic/README.md similarity index 100% rename from minecraft_java/forge/curseforge-generic/README.md rename to minecraft/java/forge/curseforge-generic/README.md diff --git a/minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json b/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json similarity index 100% rename from minecraft_java/forge/curseforge-generic/egg-curseforge-generic.json rename to minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json diff --git a/minecraft_java/forge/forge/README.md b/minecraft/java/forge/forge/README.md similarity index 100% rename from minecraft_java/forge/forge/README.md rename to minecraft/java/forge/forge/README.md diff --git a/minecraft_java/forge/forge/egg-forge-enhanced.json b/minecraft/java/forge/forge/egg-forge-enhanced.json similarity index 100% rename from minecraft_java/forge/forge/egg-forge-enhanced.json rename to minecraft/java/forge/forge/egg-forge-enhanced.json diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft/java/ftb/feed-the-beast/egg-feed-the-beast.json similarity index 100% rename from minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json rename to minecraft/java/ftb/feed-the-beast/egg-feed-the-beast.json diff --git a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft/java/ftb/ftb-revelation/egg-f-t-b-revelation.json similarity index 100% rename from minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json rename to minecraft/java/ftb/ftb-revelation/egg-f-t-b-revelation.json diff --git a/minecraft_java/magma/README.md b/minecraft/java/magma/README.md similarity index 100% rename from minecraft_java/magma/README.md rename to minecraft/java/magma/README.md diff --git a/minecraft_java/magma/egg-magma.json b/minecraft/java/magma/egg-magma.json similarity index 100% rename from minecraft_java/magma/egg-magma.json rename to minecraft/java/magma/egg-magma.json diff --git a/minecraft_java/paper/README.MD b/minecraft/java/paper/README.MD similarity index 100% rename from minecraft_java/paper/README.MD rename to minecraft/java/paper/README.MD diff --git a/minecraft_java/paper/egg-paper.json b/minecraft/java/paper/egg-paper.json similarity index 100% rename from minecraft_java/paper/egg-paper.json rename to minecraft/java/paper/egg-paper.json diff --git a/minecraft_java/server.properties b/minecraft/java/server.properties similarity index 100% rename from minecraft_java/server.properties rename to minecraft/java/server.properties diff --git a/minecraft_java/spigot/README.MD b/minecraft/java/spigot/README.MD similarity index 100% rename from minecraft_java/spigot/README.MD rename to minecraft/java/spigot/README.MD diff --git a/minecraft_java/spigot/egg-spigot.json b/minecraft/java/spigot/egg-spigot.json similarity index 100% rename from minecraft_java/spigot/egg-spigot.json rename to minecraft/java/spigot/egg-spigot.json diff --git a/minecraft_java/spongeforge/README.MD b/minecraft/java/spongeforge/README.MD similarity index 100% rename from minecraft_java/spongeforge/README.MD rename to minecraft/java/spongeforge/README.MD diff --git a/minecraft_java/spongeforge/egg-sponge-forge.json b/minecraft/java/spongeforge/egg-sponge-forge.json similarity index 100% rename from minecraft_java/spongeforge/egg-sponge-forge.json rename to minecraft/java/spongeforge/egg-sponge-forge.json diff --git a/minecraft_java/spongevanilla/README.MD b/minecraft/java/spongevanilla/README.MD similarity index 100% rename from minecraft_java/spongevanilla/README.MD rename to minecraft/java/spongevanilla/README.MD diff --git a/minecraft_java/spongevanilla/egg-sponge-vanilla.json b/minecraft/java/spongevanilla/egg-sponge-vanilla.json similarity index 100% rename from minecraft_java/spongevanilla/egg-sponge-vanilla.json rename to minecraft/java/spongevanilla/egg-sponge-vanilla.json diff --git a/minecraft_java/technic/README.md b/minecraft/java/technic/README.md similarity index 100% rename from minecraft_java/technic/README.md rename to minecraft/java/technic/README.md diff --git a/minecraft_java/technic/attack-of-the-bteam/README.MD b/minecraft/java/technic/attack-of-the-bteam/README.MD similarity index 100% rename from minecraft_java/technic/attack-of-the-bteam/README.MD rename to minecraft/java/technic/attack-of-the-bteam/README.MD diff --git a/minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json b/minecraft/java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json similarity index 100% rename from minecraft_java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json rename to minecraft/java/technic/attack-of-the-bteam/egg-attack-of-the-b--team.json diff --git a/minecraft_java/technic/blightfall/egg-blightfall.json b/minecraft/java/technic/blightfall/egg-blightfall.json similarity index 100% rename from minecraft_java/technic/blightfall/egg-blightfall.json rename to minecraft/java/technic/blightfall/egg-blightfall.json diff --git a/minecraft_java/technic/hexxit/egg-hexxit.json b/minecraft/java/technic/hexxit/egg-hexxit.json similarity index 100% rename from minecraft_java/technic/hexxit/egg-hexxit.json rename to minecraft/java/technic/hexxit/egg-hexxit.json diff --git a/minecraft_java/technic/tekkit-classic/egg-tekkit-classic.json b/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json similarity index 100% rename from minecraft_java/technic/tekkit-classic/egg-tekkit-classic.json rename to minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json diff --git a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json b/minecraft/java/technic/tekkit-legends/egg-tekkit-legends.json similarity index 100% rename from minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json rename to minecraft/java/technic/tekkit-legends/egg-tekkit-legends.json diff --git a/minecraft_java/technic/the-1-7-10-pack/README.MD b/minecraft/java/technic/the-1-7-10-pack/README.MD similarity index 100% rename from minecraft_java/technic/the-1-7-10-pack/README.MD rename to minecraft/java/technic/the-1-7-10-pack/README.MD diff --git a/minecraft_java/technic/the-1-7-10-pack/egg-the1-7-10-pack.json b/minecraft/java/technic/the-1-7-10-pack/egg-the1-7-10-pack.json similarity index 100% rename from minecraft_java/technic/the-1-7-10-pack/egg-the1-7-10-pack.json rename to minecraft/java/technic/the-1-7-10-pack/egg-the1-7-10-pack.json diff --git a/minecraft_java/tuinity/.gitignore b/minecraft/java/tuinity/.gitignore similarity index 100% rename from minecraft_java/tuinity/.gitignore rename to minecraft/java/tuinity/.gitignore diff --git a/minecraft_java/tuinity/egg-tuinity.json b/minecraft/java/tuinity/egg-tuinity.json similarity index 100% rename from minecraft_java/tuinity/egg-tuinity.json rename to minecraft/java/tuinity/egg-tuinity.json diff --git a/minecraft_java/vanillacord/README.md b/minecraft/java/vanillacord/README.md similarity index 100% rename from minecraft_java/vanillacord/README.md rename to minecraft/java/vanillacord/README.md diff --git a/minecraft_java/vanillacord/egg-vanilla-cord.json b/minecraft/java/vanillacord/egg-vanilla-cord.json similarity index 100% rename from minecraft_java/vanillacord/egg-vanilla-cord.json rename to minecraft/java/vanillacord/egg-vanilla-cord.json diff --git a/minecraft_proxy/typhoonlimbo/README.md b/minecraft/proxy/typhoonlimbo/README.md similarity index 100% rename from minecraft_proxy/typhoonlimbo/README.md rename to minecraft/proxy/typhoonlimbo/README.md diff --git a/minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json b/minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json similarity index 100% rename from minecraft_proxy/typhoonlimbo/egg-typhoon-limbo.json rename to minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json diff --git a/minecraft_proxy/velocity/README.md b/minecraft/proxy/velocity/README.md similarity index 100% rename from minecraft_proxy/velocity/README.md rename to minecraft/proxy/velocity/README.md diff --git a/minecraft_proxy/velocity/egg-velocity.json b/minecraft/proxy/velocity/egg-velocity.json similarity index 100% rename from minecraft_proxy/velocity/egg-velocity.json rename to minecraft/proxy/velocity/egg-velocity.json diff --git a/minecraft_proxy/velocity/velocity.toml b/minecraft/proxy/velocity/velocity.toml similarity index 100% rename from minecraft_proxy/velocity/velocity.toml rename to minecraft/proxy/velocity/velocity.toml diff --git a/minecraft/proxy/waterfall/README.md b/minecraft/proxy/waterfall/README.md new file mode 100644 index 00000000..e69de29b diff --git a/minecraft_proxy/waterfall/config.yml b/minecraft/proxy/waterfall/config.yml similarity index 100% rename from minecraft_proxy/waterfall/config.yml rename to minecraft/proxy/waterfall/config.yml diff --git a/minecraft_proxy/waterfall/egg-waterfall.json b/minecraft/proxy/waterfall/egg-waterfall.json similarity index 100% rename from minecraft_proxy/waterfall/egg-waterfall.json rename to minecraft/proxy/waterfall/egg-waterfall.json diff --git a/unturned/rocketmod/egg-rocket-mod-modern.json b/steamcmd_servers/unturned/rocketmod/egg-rocket-mod-modern.json similarity index 100% rename from unturned/rocketmod/egg-rocket-mod-modern.json rename to steamcmd_servers/unturned/rocketmod/egg-rocket-mod-modern.json diff --git a/unturned/rocketmod/egg-rocketmod-old.json b/steamcmd_servers/unturned/rocketmod/egg-rocketmod-old.json similarity index 100% rename from unturned/rocketmod/egg-rocketmod-old.json rename to steamcmd_servers/unturned/rocketmod/egg-rocketmod-old.json diff --git a/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json b/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json deleted file mode 100644 index acaf657f..00000000 --- a/steamcmd_servers/unturned/rocketmod/egg-rocketmod.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2018-04-27T21:30:05+00:00", - "name": "RocketMod", - "author": "isaac@isaacs.site", - "description": "The RocketMod server mod for Unturned.", - "image": "registry.gitlab.com\/tenten8401\/pterodactyl-unturned", - "startup": "mono RocketLauncher.exe unturned", - "config": { - "files": "{\r\n \"Servers\/unturned\/Server\/Commands.dat\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"Port\": \"Port {{server.build.default.port}}\"\r\n }\r\n}\r\n}", - "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", - "logs": "{\r\n \"custom\": true,\r\n \"location\": \"latest.log\"\r\n}", - "stop": "shutdown" - }, - "scripts": { - "installation": { - "script": "apt update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\n\r\nchown -R root:root \/mnt\r\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +@sSteamCmdForcePlatformBitness 32 +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update 304930 +quit\r\n\r\nmkdir -p \/mnt\/server\/Servers\/unturned\/Server\r\necho \"Port 27015\" > \/mnt\/server\/Servers\/unturned\/Server\/Commands.dat\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so", - "container": "ubuntu:16.04", - "entrypoint": "bash" - } - }, - "variables": [ - { - "name": "Steam User", - "description": "A Steam username with Unturned on the account.", - "env_variable": "STEAM_USER", - "default_value": "anonymous", - "user_viewable": 0, - "user_editable": 0, - "rules": "required|string" - }, - { - "name": "Steam Password", - "description": "Steam User Password", - "env_variable": "STEAM_PASS", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "nullable|string" - }, - { - "name": "Steam Auth Code", - "description": "Steam Auth Code only when you're using Steam Auth", - "env_variable": "STEAM_AUTH", - "default_value": "", - "user_viewable": 0, - "user_editable": 0, - "rules": "nullable|string" - } - ] -} \ No newline at end of file From 74eae43a90f7f43c572744889a7f737760387d58 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Fri, 26 Jun 2020 11:39:43 -0400 Subject: [PATCH 03/23] add new mc readme --- minecraft/README.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/minecraft/README.md b/minecraft/README.md index e69de29b..51d80c92 100644 --- a/minecraft/README.md +++ b/minecraft/README.md @@ -0,0 +1,30 @@ +# Minecraft + +It’s a game about placing blocks and going on adventures + +It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril! + +[Bedrock](/minecraft/bedrock/) Servers for Bedrock Minecraft (Windows 10, mobile, console) +* [Bedrock](/minecraft/bedrock/bedrock/) +* [DragonProxy](/minecraft/bedrock/dragonproxy/) +* [Nukkit](/minecraft/bedrock/nukkit/) +* [PocketMine MP](/minecraft/bedrock/pocketmine_mp/) + +[Java](/minecraft/java/) Servers for Java Minecraft +* [Cuberite](/minecraft/java/cuberite/) +* [feather](/minecraft/feather/) +* [Feed The Beast](/minecraft/java/ftb/) +* [Forge](/minecraft/java/forge/) +* [Magma](/minecraft/java/magma/) +* [Paper](/minecraft/java/paper) +* [Spigot](/minecraft/java/spigot/) +* [spongeforge](/minecraft/java/spongeforge/) +* [SpongeVanilla](/minecraft/java/spongevanilla/) +* [Technic](/minecraft/java/technic/) +* [Tuinity](/minecraft/java/tuinity/) +* [VanillaCord](/minecraft/java/vanillacord/) + +[Proxies](/minecraft/proxy/) Minecraft Server Proxies +* [Waterfall](/minecraft/proxy/waterfall/) Java +* [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) Java +* [Velocity](/minecraft/proxy/velocity/) Java \ No newline at end of file From cc472b23af981bb100b12ccf9e09fa79ee94bb40 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 11 Jul 2020 08:47:43 -0400 Subject: [PATCH 04/23] add flag for windows app install adds a `WINDOWS_INSTALL` flag to the install script. adds notes on the variables in the script. --- scripts/steamcmd_installer.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index c36fa040..b2dce4aa 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -3,6 +3,17 @@ # # Server Files: /mnt/server # Image to install with is 'debian:buster-slim' + +## +# +# Variables +# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install. +# WINDOWS_INSTALL - if it's a windows server you want to install set to 1 +# SRCDS_APPID - steam app id ffound here - https://developer.valvesoftware.com/wiki/Dedicated_Servers_List +# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates. +# +## + apt -y update apt -y --no-install-recommends install curl lib32gcc1 ca-certificates @@ -30,7 +41,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir /mnt/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 +./steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [ "${WINDOWS_INSTALL}" == "1" ] || printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /mnt/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From 679d20ce4d81b050519e25a935904e815744f1ec Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sat, 11 Jul 2020 19:50:57 -0400 Subject: [PATCH 05/23] update start command for python generic --- bots/discord/discord.py/egg-discord-py-generic.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json index 694e4d6e..1630eda7 100644 --- a/bots/discord/discord.py/egg-discord-py-generic.json +++ b/bots/discord/discord.py/egg-discord-py-generic.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-06-29T16:59:56-04:00", + "exported_at": "2020-07-11T19:48:14-04:00", "name": "discord.py generic", "author": "parker@parkervcp.com", "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_python-3.8", - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${PY_PACKAGES} ]]; then pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}; fi; if [ -f \/home\/container\/requirements.txt]; then pip install -U --target \/mnt\/server\/ -r requirements.txt; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${PY_PACKAGES} ]]; then pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}; fi; if [[ -f \/home\/container\/requirements.txt ]]; then pip install -U --target \/mnt\/server\/ -r requirements.txt; fi; \/usr\/local\/bin\/python \/home\/container\/{{BOT_PY_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git gcc g++ libffi-dev make\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\nfi\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\tfi\r\nfi \r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", + "script": "#!\/bin\/bash\r\n# Python Bot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y git gcc g++ libffi-dev make\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [[ ! ${INSTALL_REPO} = *\\.git ]]; then\r\n INSTALL_REPO=$(echo -e ${INSTALL_REPO} | sed 's:\/*$::')\r\n INSTALL_REPO=\"${INSTALL_REPO}.git\"\r\nfi\r\n\r\necho -e \"working on installing a discord.py bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\tfi\r\n\telse\r\n \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\tfi\r\nfi \r\n\r\necho \"Installing python requirements into folder\"\r\nif [[ ! -z ${PY_PACKAGES} ]]; then\r\n pip install -U --target \/mnt\/server\/ ${PY_PACKAGES}\r\nfi\r\n\r\nif [ -f \/mnt\/server\/requirements.txt ]; then\r\n pip install -U --target \/mnt\/server\/ -r requirements.txt\r\nfi\r\n\r\necho -e \"install complete\"\r\nexit 0", "container": "python:3.8-slim", "entrypoint": "bash" } From 3a7a15f21a4f0d2e6ccdef3669f60617298da415 Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:01:50 +0200 Subject: [PATCH 06/23] Moved README.md --- database/sql/mariadb/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 database/sql/mariadb/README.md diff --git a/database/sql/mariadb/README.md b/database/sql/mariadb/README.md new file mode 100644 index 00000000..10acde47 --- /dev/null +++ b/database/sql/mariadb/README.md @@ -0,0 +1,17 @@ +# MariaDB +### From their [Website](https://mariadb.org/) +One of the most popular database servers. Made by the original developers of MySQL. +Guaranteed to stay open source. + +### Minimum RAM warning +There is no actual minimum suggested for MariaDB. + +See here https://mariadb.com/kb/en/library/mariadb-hardware-requirements/ + + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|---------|---------| +| Server | 3306 | From 743ff73d21e953a50245721eb8811a39465afc1e Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:08:43 +0200 Subject: [PATCH 07/23] Move egg to new folder --- database/sql/mariadb/egg-maria-d-b.json | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 database/sql/mariadb/egg-maria-d-b.json diff --git a/database/sql/mariadb/egg-maria-d-b.json b/database/sql/mariadb/egg-maria-d-b.json new file mode 100644 index 00000000..6d23ccbf --- /dev/null +++ b/database/sql/mariadb/egg-maria-d-b.json @@ -0,0 +1,26 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2019-11-06T18:52:33-05:00", + "name": "MariaDB", + "author": "parker@parkervcp.com", + "description": "One of the most popular database servers. Made by the original developers of MySQL. Guaranteed to stay open source.", + "image": "quay.io\/parkervcp\/pterodactyl-images:db_mariadb", + "startup": "{ \/usr\/sbin\/mysqld & } && sleep 5 && mysql -u root", + "config": { + "files": "{\r\n \".my.cnf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"port\": \"port = {{server.build.default.port}}\",\r\n \"bind-address\": \"bind-address=0.0.0.0\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"mysqld: ready for connections\"\r\n}", + "logs": "{}", + "stop": "shutdown; exit;" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "container": "mariadb:10.3", + "entrypoint": "bash" + } + }, + "variables": [] +} From 0e7afacfb3f0472bd0320be74cb8643ed788bc00 Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:09:21 +0200 Subject: [PATCH 08/23] Move my.cnf to new folder --- database/sql/mariadb/my.cnf | 190 ++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 database/sql/mariadb/my.cnf diff --git a/database/sql/mariadb/my.cnf b/database/sql/mariadb/my.cnf new file mode 100644 index 00000000..37ff3163 --- /dev/null +++ b/database/sql/mariadb/my.cnf @@ -0,0 +1,190 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /home/container/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /home/container/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +#user = mysql +pid-file = /home/container/run/mysqld/mysqld.pid +socket = /home/container/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /home/container/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address=0.0.0.0 +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 +max_allowed_packet = 16M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +general_log_file = /home/container/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +#log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /home/container/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!include /etc/mysql/mariadb.cnf +!includedir /etc/mysql/conf.d/ From bb5b5a84a8c11b4ce1243171f72f9958267302a2 Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:10:02 +0200 Subject: [PATCH 09/23] Move install.my.cnf --- database/sql/mariadb/install.my.cnf | 189 ++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 database/sql/mariadb/install.my.cnf diff --git a/database/sql/mariadb/install.my.cnf b/database/sql/mariadb/install.my.cnf new file mode 100644 index 00000000..d921db17 --- /dev/null +++ b/database/sql/mariadb/install.my.cnf @@ -0,0 +1,189 @@ +# MariaDB database server configuration file. +# +# You can copy this file to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /mnt/server/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /mnt/server/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +#user = mysql +pid-file = /mnt/server/run/mysqld/mysqld.pid +socket = /mnt/server/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /mnt/server/mysql +tmpdir = /tmp +lc_messages_dir = /usr/share/mysql +lc_messages = en_US +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +# +# * Fine Tuning +# +max_connections = 100 +connect_timeout = 5 +wait_timeout = 600 +max_allowed_packet = 16M +thread_cache_size = 128 +sort_buffer_size = 4M +bulk_insert_buffer_size = 16M +tmp_table_size = 32M +max_heap_table_size = 32M +# +# * MyISAM +# +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched. On error, make copy and try a repair. +myisam_recover_options = BACKUP +key_buffer_size = 128M +#open-files-limit = 2000 +table_open_cache = 400 +myisam_sort_buffer_size = 512M +concurrent_insert = 2 +read_buffer_size = 2M +read_rnd_buffer_size = 1M +# +# * Query Cache Configuration +# +# Cache only tiny result sets, so we can fit more in the query cache. +query_cache_limit = 128K +query_cache_size = 64M +# for more write intensive setups, set to DEMAND or OFF +#query_cache_type = DEMAND +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +general_log_file = /mnt/server/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# we do want to know about network errors and such +#log_warnings = 2 +# +# Enable the slow query log to see queries with especially long duration +#slow_query_log[={0|1}] +slow_query_log_file = /mnt/server/log/mysql/mariadb-slow.log +long_query_time = 10 +#log_slow_rate_limit = 1000 +#log_slow_verbosity = query_plan + +#log-queries-not-using-indexes +#log_slow_admin_statements +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#report_host = master1 +#auto_increment_increment = 2 +#auto_increment_offset = 1 +#log_bin = /var/log/mysql/mariadb-bin +#log_bin_index = /var/log/mysql/mariadb-bin.index +# not fab for performance, but safer +#sync_binlog = 1 +expire_logs_days = 10 +max_binlog_size = 100M +# slaves +#relay_log = /var/log/mysql/relay-bin +#relay_log_index = /var/log/mysql/relay-bin.index +#relay_log_info_file = /var/log/mysql/relay-bin.info +#log_slave_updates +#read_only +# +# If applications support it, this stricter sql_mode prevents some +# mistakes like inserting invalid dates etc. +#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +default_storage_engine = InnoDB +# you can't just change log file size, requires special procedure +#innodb_log_file_size = 50M +innodb_buffer_pool_size = 256M +innodb_log_buffer_size = 8M +innodb_file_per_table = 1 +innodb_open_files = 400 +innodb_io_capacity = 400 +innodb_flush_method = O_DIRECT +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + +# +# * Galera-related settings +# +[galera] +# Mandatory settings +#wsrep_on=ON +#wsrep_provider= +#wsrep_cluster_address= +#binlog_format=row +#default_storage_engine=InnoDB +#innodb_autoinc_lock_mode=2 +# +# Allow server to accept connections on all interfaces. +# +bind-address=0.0.0.0 +# +# Optional setting +#wsrep_slave_threads=1 +#innodb_flush_log_at_trx_commit=0 + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completion + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!include /etc/mysql/mariadb.cnf +!includedir /etc/mysql/conf.d/ From d959b3d3e0bb38c9056d04b00cc82910803d4a3d Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:12:54 +0200 Subject: [PATCH 10/23] Update install url --- database/sql/mariadb/egg-maria-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/sql/mariadb/egg-maria-d-b.json b/database/sql/mariadb/egg-maria-d-b.json index 6d23ccbf..cf01b40b 100644 --- a/database/sql/mariadb/egg-maria-d-b.json +++ b/database/sql/mariadb/egg-maria-d-b.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/FoksVHox\/eggs\/Fix-mariadb-folder-structure\/database\/sql\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", "container": "mariadb:10.3", "entrypoint": "bash" } From 633a2c03f74cddf50948ec57e57c3e3ad7afd8da Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:32:33 +0200 Subject: [PATCH 11/23] Update install URL (now uses parkers repo) --- database/sql/mariadb/egg-maria-d-b.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/sql/mariadb/egg-maria-d-b.json b/database/sql/mariadb/egg-maria-d-b.json index cf01b40b..fb03ff41 100644 --- a/database/sql/mariadb/egg-maria-d-b.json +++ b/database/sql/mariadb/egg-maria-d-b.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/FoksVHox\/eggs\/Fix-mariadb-folder-structure\/database\/sql\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", + "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/sql\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/sql\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/sql\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", "container": "mariadb:10.3", "entrypoint": "bash" } From 19f2e376ab2af6e4425a518cee3b36261005416f Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:34:26 +0200 Subject: [PATCH 12/23] Delete old file --- database/sql/postgres/mariadb/README.md | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 database/sql/postgres/mariadb/README.md diff --git a/database/sql/postgres/mariadb/README.md b/database/sql/postgres/mariadb/README.md deleted file mode 100644 index 10acde47..00000000 --- a/database/sql/postgres/mariadb/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# MariaDB -### From their [Website](https://mariadb.org/) -One of the most popular database servers. Made by the original developers of MySQL. -Guaranteed to stay open source. - -### Minimum RAM warning -There is no actual minimum suggested for MariaDB. - -See here https://mariadb.com/kb/en/library/mariadb-hardware-requirements/ - - -### Server Ports -Ports required to run the server in a table format. - -| Port | default | -|---------|---------| -| Server | 3306 | From b6af2479b7f90d24b581a7924a78cfa37212ed6a Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:34:46 +0200 Subject: [PATCH 13/23] Delete old files --- .../sql/postgres/mariadb/egg-maria-d-b.json | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 database/sql/postgres/mariadb/egg-maria-d-b.json diff --git a/database/sql/postgres/mariadb/egg-maria-d-b.json b/database/sql/postgres/mariadb/egg-maria-d-b.json deleted file mode 100644 index 12afd857..00000000 --- a/database/sql/postgres/mariadb/egg-maria-d-b.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", - "meta": { - "version": "PTDL_v1" - }, - "exported_at": "2019-11-06T18:52:33-05:00", - "name": "MariaDB", - "author": "parker@parkervcp.com", - "description": "One of the most popular database servers. Made by the original developers of MySQL. Guaranteed to stay open source.", - "image": "quay.io\/parkervcp\/pterodactyl-images:db_mariadb", - "startup": "{ \/usr\/sbin\/mysqld & } && sleep 5 && mysql -u root", - "config": { - "files": "{\r\n \".my.cnf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"port\": \"port = {{server.build.default.port}}\",\r\n \"bind-address\": \"bind-address=0.0.0.0\"\r\n }\r\n }\r\n}", - "startup": "{\r\n \"done\": \"mysqld: ready for connections\"\r\n}", - "logs": "{}", - "stop": "shutdown; exit;" - }, - "scripts": { - "installation": { - "script": "#!\/bin\/bash\r\n# MariaDB Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nset -x\r\n\r\necho -e \"installing dependencies\"\r\napt-get -y update\r\napt-get -y install curl\r\n\r\n## add user\r\necho -e \"adding container user\"\r\nuseradd -d \/home\/container -m container -s \/bin\/bash\r\n\r\n## own server to container user\r\nchown container: \/mnt\/server\/\r\n\r\n## run install script as user\r\necho -e \"getting my.conf\"\r\nif [ -f \/mnt\/server\/.my.cnf ]; then\r\n echo -e \"moving current config for install\"\r\n mv \/mnt\/server\/.my.cnf \/mnt\/server\/custom.my.cnf\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nelse\r\n runuser -l container -c 'curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/install.my.cnf > \/mnt\/server\/.my.cnf'\r\nfi\r\n\r\n## mkdir and install db\r\necho -e \"installing mysql database\"\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/run\/mysqld'\r\nrunuser -l container -c 'mkdir -p \/mnt\/server\/log\/mysql'\r\nrunuser -l container -c 'mkdir \/mnt\/server\/mysql'\r\n\r\nrunuser -l container -c 'mysql_install_db --defaults-file=\/mnt\/server\/.my.cnf'\r\n\r\nif [ -f \/mnt\/server\/custom.my.cnf ]; then\r\n echo -e \"moving current config back in place\"\r\n mv \/mnt\/server\/custom.my.cnf \/mnt\/server\/.my.cnf\r\nelse\r\n curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/database\/mariadb\/my.cnf > \/mnt\/server\/.my.cnf\r\nfi\r\n\r\necho -e \"install complete\"\r\n\r\nexit", - "container": "mariadb:10.3", - "entrypoint": "bash" - } - }, - "variables": [] -} \ No newline at end of file From 5c9d8f2a14172ac20c25ddba753f1c9eef49d93d Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:35:03 +0200 Subject: [PATCH 14/23] Delete old file --- database/sql/postgres/mariadb/install.my.cnf | 189 ------------------- 1 file changed, 189 deletions(-) delete mode 100644 database/sql/postgres/mariadb/install.my.cnf diff --git a/database/sql/postgres/mariadb/install.my.cnf b/database/sql/postgres/mariadb/install.my.cnf deleted file mode 100644 index f1af70ac..00000000 --- a/database/sql/postgres/mariadb/install.my.cnf +++ /dev/null @@ -1,189 +0,0 @@ -# MariaDB database server configuration file. -# -# You can copy this file to one of: -# - "/etc/mysql/my.cnf" to set global options, -# - "~/.my.cnf" to set user-specific options. -# -# One can use all long options that the program supports. -# Run program with --help to get a list of available options and with -# --print-defaults to see which it would actually understand and use. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# escpecially if they contain "#" chars... -# Remember to edit /etc/mysql/debian.cnf when changing the socket location. -[client] -port = 3306 -socket = /mnt/server/run/mysqld/mysqld.sock - -# Here is entries for some specific programs -# The following values assume you have at least 32M ram - -# This was formally known as [safe_mysqld]. Both versions are currently parsed. -[mysqld_safe] -socket = /mnt/server/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -# -# * Basic Settings -# -#user = mysql -pid-file = /mnt/server/run/mysqld/mysqld.pid -socket = /mnt/server/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /mnt/server/mysql -tmpdir = /tmp -lc_messages_dir = /usr/share/mysql -lc_messages = en_US -skip-external-locking -# -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -# -# * Fine Tuning -# -max_connections = 100 -connect_timeout = 5 -wait_timeout = 600 -max_allowed_packet = 16M -thread_cache_size = 128 -sort_buffer_size = 4M -bulk_insert_buffer_size = 16M -tmp_table_size = 32M -max_heap_table_size = 32M -# -# * MyISAM -# -# This replaces the startup script and checks MyISAM tables if needed -# the first time they are touched. On error, make copy and try a repair. -myisam_recover_options = BACKUP -key_buffer_size = 128M -#open-files-limit = 2000 -table_open_cache = 400 -myisam_sort_buffer_size = 512M -concurrent_insert = 2 -read_buffer_size = 2M -read_rnd_buffer_size = 1M -# -# * Query Cache Configuration -# -# Cache only tiny result sets, so we can fit more in the query cache. -query_cache_limit = 128K -query_cache_size = 64M -# for more write intensive setups, set to DEMAND or OFF -#query_cache_type = DEMAND -# -# * Logging and Replication -# -# Both location gets rotated by the cronjob. -# Be aware that this log type is a performance killer. -# As of 5.1 you can enable the log at runtime! -general_log_file = /mnt/server/log/mysql/mysql.log -#general_log = 1 -# -# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. -# -# we do want to know about network errors and such -#log_warnings = 2 -# -# Enable the slow query log to see queries with especially long duration -#slow_query_log[={0|1}] -slow_query_log_file = /mnt/server/log/mysql/mariadb-slow.log -long_query_time = 10 -#log_slow_rate_limit = 1000 -#log_slow_verbosity = query_plan - -#log-queries-not-using-indexes -#log_slow_admin_statements -# -# The following can be used as easy to replay backup logs or for replication. -# note: if you are setting up a replication slave, see README.Debian about -# other settings you may need to change. -#server-id = 1 -#report_host = master1 -#auto_increment_increment = 2 -#auto_increment_offset = 1 -#log_bin = /var/log/mysql/mariadb-bin -#log_bin_index = /var/log/mysql/mariadb-bin.index -# not fab for performance, but safer -#sync_binlog = 1 -expire_logs_days = 10 -max_binlog_size = 100M -# slaves -#relay_log = /var/log/mysql/relay-bin -#relay_log_index = /var/log/mysql/relay-bin.index -#relay_log_info_file = /var/log/mysql/relay-bin.info -#log_slave_updates -#read_only -# -# If applications support it, this stricter sql_mode prevents some -# mistakes like inserting invalid dates etc. -#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL -# -# * InnoDB -# -# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. -# Read the manual for more InnoDB related options. There are many! -default_storage_engine = InnoDB -# you can't just change log file size, requires special procedure -#innodb_log_file_size = 50M -innodb_buffer_pool_size = 256M -innodb_log_buffer_size = 8M -innodb_file_per_table = 1 -innodb_open_files = 400 -innodb_io_capacity = 400 -innodb_flush_method = O_DIRECT -# -# * Security Features -# -# Read the manual, too, if you want chroot! -# chroot = /var/lib/mysql/ -# -# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". -# -# ssl-ca=/etc/mysql/cacert.pem -# ssl-cert=/etc/mysql/server-cert.pem -# ssl-key=/etc/mysql/server-key.pem - -# -# * Galera-related settings -# -[galera] -# Mandatory settings -#wsrep_on=ON -#wsrep_provider= -#wsrep_cluster_address= -#binlog_format=row -#default_storage_engine=InnoDB -#innodb_autoinc_lock_mode=2 -# -# Allow server to accept connections on all interfaces. -# -bind-address=0.0.0.0 -# -# Optional setting -#wsrep_slave_threads=1 -#innodb_flush_log_at_trx_commit=0 - -[mysqldump] -quick -quote-names -max_allowed_packet = 16M - -[mysql] -#no-auto-rehash # faster start of mysql but no tab completion - -[isamchk] -key_buffer = 16M - -# -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!include /etc/mysql/mariadb.cnf -!includedir /etc/mysql/conf.d/ \ No newline at end of file From 567cef877ed99edade4ef299e99796d27e08e215 Mon Sep 17 00:00:00 2001 From: Foks <37844753+FoksVHox@users.noreply.github.com> Date: Sun, 12 Jul 2020 18:35:19 +0200 Subject: [PATCH 15/23] Delete old file --- database/sql/postgres/mariadb/my.cnf | 190 --------------------------- 1 file changed, 190 deletions(-) delete mode 100644 database/sql/postgres/mariadb/my.cnf diff --git a/database/sql/postgres/mariadb/my.cnf b/database/sql/postgres/mariadb/my.cnf deleted file mode 100644 index 3049c1bb..00000000 --- a/database/sql/postgres/mariadb/my.cnf +++ /dev/null @@ -1,190 +0,0 @@ -# MariaDB database server configuration file. -# -# You can copy this file to one of: -# - "/etc/mysql/my.cnf" to set global options, -# - "~/.my.cnf" to set user-specific options. -# -# One can use all long options that the program supports. -# Run program with --help to get a list of available options and with -# --print-defaults to see which it would actually understand and use. -# -# For explanations see -# http://dev.mysql.com/doc/mysql/en/server-system-variables.html - -# This will be passed to all mysql clients -# It has been reported that passwords should be enclosed with ticks/quotes -# escpecially if they contain "#" chars... -# Remember to edit /etc/mysql/debian.cnf when changing the socket location. -[client] -port = 3306 -socket = /home/container/run/mysqld/mysqld.sock - -# Here is entries for some specific programs -# The following values assume you have at least 32M ram - -# This was formally known as [safe_mysqld]. Both versions are currently parsed. -[mysqld_safe] -socket = /home/container/run/mysqld/mysqld.sock -nice = 0 - -[mysqld] -# -# * Basic Settings -# -#user = mysql -pid-file = /home/container/run/mysqld/mysqld.pid -socket = /home/container/run/mysqld/mysqld.sock -port = 3306 -basedir = /usr -datadir = /home/container/mysql -tmpdir = /tmp -lc_messages_dir = /usr/share/mysql -lc_messages = en_US -skip-external-locking -# -# Instead of skip-networking the default is now to listen only on -# localhost which is more compatible and is not less secure. -bind-address=0.0.0.0 -# -# * Fine Tuning -# -max_connections = 100 -connect_timeout = 5 -wait_timeout = 600 -max_allowed_packet = 16M -thread_cache_size = 128 -sort_buffer_size = 4M -bulk_insert_buffer_size = 16M -tmp_table_size = 32M -max_heap_table_size = 32M -# -# * MyISAM -# -# This replaces the startup script and checks MyISAM tables if needed -# the first time they are touched. On error, make copy and try a repair. -myisam_recover_options = BACKUP -key_buffer_size = 128M -#open-files-limit = 2000 -table_open_cache = 400 -myisam_sort_buffer_size = 512M -concurrent_insert = 2 -read_buffer_size = 2M -read_rnd_buffer_size = 1M -# -# * Query Cache Configuration -# -# Cache only tiny result sets, so we can fit more in the query cache. -query_cache_limit = 128K -query_cache_size = 64M -# for more write intensive setups, set to DEMAND or OFF -#query_cache_type = DEMAND -# -# * Logging and Replication -# -# Both location gets rotated by the cronjob. -# Be aware that this log type is a performance killer. -# As of 5.1 you can enable the log at runtime! -general_log_file = /home/container/log/mysql/mysql.log -#general_log = 1 -# -# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. -# -# we do want to know about network errors and such -#log_warnings = 2 -# -# Enable the slow query log to see queries with especially long duration -#slow_query_log[={0|1}] -slow_query_log_file = /home/container/log/mysql/mariadb-slow.log -long_query_time = 10 -#log_slow_rate_limit = 1000 -#log_slow_verbosity = query_plan - -#log-queries-not-using-indexes -#log_slow_admin_statements -# -# The following can be used as easy to replay backup logs or for replication. -# note: if you are setting up a replication slave, see README.Debian about -# other settings you may need to change. -#server-id = 1 -#report_host = master1 -#auto_increment_increment = 2 -#auto_increment_offset = 1 -#log_bin = /var/log/mysql/mariadb-bin -#log_bin_index = /var/log/mysql/mariadb-bin.index -# not fab for performance, but safer -#sync_binlog = 1 -expire_logs_days = 10 -max_binlog_size = 100M -# slaves -#relay_log = /var/log/mysql/relay-bin -#relay_log_index = /var/log/mysql/relay-bin.index -#relay_log_info_file = /var/log/mysql/relay-bin.info -#log_slave_updates -#read_only -# -# If applications support it, this stricter sql_mode prevents some -# mistakes like inserting invalid dates etc. -#sql_mode = NO_ENGINE_SUBSTITUTION,TRADITIONAL -# -# * InnoDB -# -# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. -# Read the manual for more InnoDB related options. There are many! -default_storage_engine = InnoDB -# you can't just change log file size, requires special procedure -#innodb_log_file_size = 50M -innodb_buffer_pool_size = 256M -innodb_log_buffer_size = 8M -innodb_file_per_table = 1 -innodb_open_files = 400 -innodb_io_capacity = 400 -innodb_flush_method = O_DIRECT -# -# * Security Features -# -# Read the manual, too, if you want chroot! -# chroot = /var/lib/mysql/ -# -# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". -# -# ssl-ca=/etc/mysql/cacert.pem -# ssl-cert=/etc/mysql/server-cert.pem -# ssl-key=/etc/mysql/server-key.pem - -# -# * Galera-related settings -# -[galera] -# Mandatory settings -#wsrep_on=ON -#wsrep_provider= -#wsrep_cluster_address= -#binlog_format=row -#default_storage_engine=InnoDB -#innodb_autoinc_lock_mode=2 -# -# Allow server to accept connections on all interfaces. -# -bind-address=0.0.0.0 -# -# Optional setting -#wsrep_slave_threads=1 -#innodb_flush_log_at_trx_commit=0 - -[mysqldump] -quick -quote-names -max_allowed_packet = 16M - -[mysql] -#no-auto-rehash # faster start of mysql but no tab completion - -[isamchk] -key_buffer = 16M - -# -# * IMPORTANT: Additional settings that can override those from this file! -# The files must end with '.cnf', otherwise they'll be ignored. -# -!include /etc/mysql/mariadb.cnf -!includedir /etc/mysql/conf.d/ \ No newline at end of file From 64b3fd19c8a0c926477f7c02196f418379571678 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 12 Jul 2020 16:39:21 -0400 Subject: [PATCH 16/23] update stock unturned egg. updated to use the built in rocketmod. --- steamcmd_servers/unturned/unturned/egg-unturned.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json index ca38ecfc..da39b0c8 100644 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ b/steamcmd_servers/unturned/unturned/egg-unturned.json @@ -3,12 +3,12 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-18T18:06:35-05:00", + "exported_at": "2020-07-12T16:38:09-04:00", "name": "Unturned", "author": "parker@parkervcp.com", - "description": "The RocketMod server mod for Unturned.", - "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian", - "startup": "wget https:\/\/github.com\/RocketMod\/Rocket.Unturned\/releases\/download\/4.9.3.0\/Rocket.Unturned.zip && unzip -o Rocket.Unturned.zip && .\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}", + "description": "Vanilla Unturned with the included RockerMod.", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", + "startup": ".\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"Loading level: 100%\",\r\n \"userInteraction\": []\r\n}", From 3e64b3a76db8290c8fefa49b7762631a1cccdb2a Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 12 Jul 2020 20:07:53 -0400 Subject: [PATCH 17/23] Add Killing Floor 2 This will add Killing Floor 2 --- steamcmd_servers/killing_floor_2/README.md | 13 ++ .../killing_floor_2/egg-killing-floor2.json | 135 ++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 steamcmd_servers/killing_floor_2/README.md create mode 100644 steamcmd_servers/killing_floor_2/egg-killing-floor2.json diff --git a/steamcmd_servers/killing_floor_2/README.md b/steamcmd_servers/killing_floor_2/README.md new file mode 100644 index 00000000..49c02fd1 --- /dev/null +++ b/steamcmd_servers/killing_floor_2/README.md @@ -0,0 +1,13 @@ +# Killing Floor 2 +### From their [Site](https://killingfloor2.com/) +In KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech’s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere. + +### Server Ports +Ports required to run the server in a table format. + +| Port | default | +|------------|---------| +| Game Port | 7777 | +| Query Port | 27015 | +|Extra Ports |---------| +| Web Admin | 8080 | \ No newline at end of file diff --git a/steamcmd_servers/killing_floor_2/egg-killing-floor2.json b/steamcmd_servers/killing_floor_2/egg-killing-floor2.json new file mode 100644 index 00000000..db35b49a --- /dev/null +++ b/steamcmd_servers/killing_floor_2/egg-killing-floor2.json @@ -0,0 +1,135 @@ +{ + "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO", + "meta": { + "version": "PTDL_v1" + }, + "exported_at": "2020-07-12T20:06:39-04:00", + "name": "Killing Floor 2", + "author": "parker@parkervcp.com", + "description": "n KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech\u2019s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere.", + "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source", + "startup": "\/home\/container\/Binaries\/Win64\/KFGameSteamServer.bin.x86_64 {{MAP_NAME}}?Port={{SERVER_PORT}}?QueryPort={{QUERY_PORT}}?AdminPassword={{ADMIN_PASS}}?Difficulty={{DIFFICULTY}}$( [ \"$WEB_ADMIN\" == \"true\" ] || printf %s '??WebAdminPort={{WEB_ADMIN_PORT}}' )", + "config": { + "files": "{\r\n \"KFGame\/Config\/KFWeb.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"IpDrv.WebServer.IpDrv.WebServer\": \"{{server.build.env.WEB_ADMIN}}\",\r\n \"IpDrv.WebServer.IpDrv.ListenPort\": \"{{server.build.env.WEB_ADMIN_PORT}}\"\r\n }\r\n },\r\n \"KFGame\/Config\/LinuxServer-KFGame.ini\": {\r\n \"parser\": \"ini\",\r\n \"find\": {\r\n \"Engine.AccessControl.AdminPassword\": \"{{server.build.env.ADMIN_PASS}}\",\r\n \"Engine.GameReplicationInfo.ServerName\": \"{{server.build.env.SERVER_NAME}}\"\r\n }\r\n }\r\n}", + "startup": "{\r\n \"done\": \"DevOnline: Playfab server registered with lobby ID \"\r\n}", + "logs": "{}", + "stop": "^C" + }, + "scripts": { + "installation": { + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [ \"${WINDOWS_INSTALL}\" == \"1\" ] || printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so", + "container": "debian:buster-slim", + "entrypoint": "bash" + } + }, + "variables": [ + { + "name": "Steam Username", + "description": "A steam username to use to install the server.\r\n\r\nOnly needed for games that need a user that owns the server", + "env_variable": "STEAM_USER", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "Steam Password", + "description": "Password for the Steam account to install a server.", + "env_variable": "STEAM_PASS", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "Steam Auth", + "description": "Will most likely time out before it gets used.", + "env_variable": "STEAM_AUTH", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string|max:6" + }, + { + "name": "Steam Server App ID", + "description": "The App ID for the Server", + "env_variable": "SRCDS_APPID", + "default_value": "232130", + "user_viewable": 0, + "user_editable": 0, + "rules": "required|string" + }, + { + "name": "Extra Flags", + "description": "Only needed for specific situations.", + "env_variable": "EXTRA_FLAGS", + "default_value": "", + "user_viewable": 0, + "user_editable": 0, + "rules": "nullable|string" + }, + { + "name": "Map Name", + "description": "The map to load when the server starts\r\n\r\ndefault - 'kf-bioticslab'", + "env_variable": "MAP_NAME", + "default_value": "kf-bioticslab", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Query Port", + "description": "The port steam will use to query the server.", + "env_variable": "QUERY_PORT", + "default_value": "27015", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|numeric|max:65535" + }, + { + "name": "Enable WebAdmin (beta)", + "description": "", + "env_variable": "WEB_ADMIN", + "default_value": "false", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|in:true,false" + }, + { + "name": "Admin Password", + "description": "An admin password for the server.", + "env_variable": "ADMIN_PASS", + "default_value": "PleaseChangeMe", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Server Name", + "description": "This is the displayed server name to all players in the server and the server browser", + "env_variable": "SERVER_NAME", + "default_value": "A Pterodactyl Hosted Server", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|string" + }, + { + "name": "Server Difficulty", + "description": "0 = Normal, 1 = Hard, 2 = Suicidal, 3 = Hell on Earth", + "env_variable": "DIFFICULTY", + "default_value": "0", + "user_viewable": 1, + "user_editable": 1, + "rules": "required|numeric|max:3" + }, + { + "name": "Web Admin Port", + "description": "The port the webadmin panel should use. This is a beta feature.", + "env_variable": "WEB_ADMIN_PORT", + "default_value": "8089", + "user_viewable": 1, + "user_editable": 0, + "rules": "required|string|max:20" + } + ] +} \ No newline at end of file From 88b0db74ef11bde5b351ad8a278b3b4b7a0decf7 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 12 Jul 2020 20:38:57 -0400 Subject: [PATCH 18/23] update installer with symlink for rocket.unturned --- steamcmd_servers/unturned/unturned/egg-unturned.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json index da39b0c8..c3ef65f9 100644 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ b/steamcmd_servers/unturned/unturned/egg-unturned.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-12T16:38:09-04:00", + "exported_at": "2020-07-12T20:38:02-04:00", "name": "Unturned", "author": "parker@parkervcp.com", "description": "Vanilla Unturned with the included RockerMod.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncp -v linux64\/steamclient.so \/mnt\/server\/Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\nln -s steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s Extras\/Rocket.Unturned\/ Modules\/", "container": "debian:buster-slim", "entrypoint": "bash" } From 75890b51abea2dcb49ba9f7f343ebd7907eefa70 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 12 Jul 2020 21:25:22 -0400 Subject: [PATCH 19/23] unturned doesn't support symlinks for so files --- steamcmd_servers/unturned/unturned/egg-unturned.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json index c3ef65f9..177461b1 100644 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ b/steamcmd_servers/unturned/unturned/egg-unturned.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-12T20:38:02-04:00", + "exported_at": "2020-07-12T21:24:45-04:00", "name": "Unturned", "author": "parker@parkervcp.com", "description": "Vanilla Unturned with the included RockerMod.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\nln -s steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s Extras\/Rocket.Unturned\/ Modules\/", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\ncp steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s Extras\/Rocket.Unturned\/ Modules\/", "container": "debian:buster-slim", "entrypoint": "bash" } From 6e7cfaf1784da3b4512231ace3a548067d317cf8 Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Sun, 12 Jul 2020 22:06:55 -0400 Subject: [PATCH 20/23] fix symlinks properly --- steamcmd_servers/unturned/unturned/egg-unturned.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamcmd_servers/unturned/unturned/egg-unturned.json b/steamcmd_servers/unturned/unturned/egg-unturned.json index 177461b1..df6abd65 100644 --- a/steamcmd_servers/unturned/unturned/egg-unturned.json +++ b/steamcmd_servers/unturned/unturned/egg-unturned.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-07-12T21:24:45-04:00", + "exported_at": "2020-07-12T22:04:47-04:00", "name": "Unturned", "author": "parker@parkervcp.com", "description": "Vanilla Unturned with the included RockerMod.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\ncp steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s Extras\/Rocket.Unturned\/ Modules\/", + "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\nDEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n echo -e \"steam user is not set.\\n\"\r\n echo -e \"Using anonymous user.\\n\"\r\n STEAM_USER=anonymous\r\n STEAM_PASS=\"\"\r\n STEAM_AUTH=\"\"\r\nelse\r\n echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Specific to Unturned\r\ncd \/mnt\/server\/\r\nln -s ..\/..\/..\/steamcmd\/linux64\/steamclient.so Unturned_Headless_Data\/Plugins\/x86_64\/steamclient.so\r\nln -s ..\/Extras\/Rocket.Unturned\/ Modules\/", "container": "debian:buster-slim", "entrypoint": "bash" } From adc9d39f80d99a16cc624cd3775a18a895cb3eca Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Mon, 13 Jul 2020 10:21:11 -0400 Subject: [PATCH 21/23] replace || with && --- scripts/steamcmd_installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh index b2dce4aa..7742daa9 100644 --- a/scripts/steamcmd_installer.sh +++ b/scripts/steamcmd_installer.sh @@ -41,7 +41,7 @@ chown -R root:root /mnt export HOME=/mnt/server ## install game using steamcmd -./steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [ "${WINDOWS_INSTALL}" == "1" ] || printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /mnt/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 +./steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir /mnt/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6 ## set up 32 bit libraries mkdir -p /mnt/server/.steam/sdk32 From bd97f6c298374056f7806f5be144badb95079d79 Mon Sep 17 00:00:00 2001 From: AwesomenessZ <44243730+AwesomenessZ@users.noreply.github.com> Date: Tue, 14 Jul 2020 13:56:22 -0400 Subject: [PATCH 22/23] Forgot a space in startup command --- bots/discord/discord.js/egg-discord-js-generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json index b63e19a7..facdad9f 100644 --- a/bots/discord/discord.js/egg-discord-js-generic.json +++ b/bots/discord/discord.js/egg-discord-js-generic.json @@ -8,7 +8,7 @@ "author": "parker@parkervcp.com", "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.", "image": "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12", - "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/usr\/local\/bin\/node\/home\/container\/{{BOT_JS_FILE}}", + "startup": "if [[ -d .git ]] && [[ {{AUTO_UPDATE}} == \"1\" ]]; then git pull; fi; if [[ ! -z ${NODE_PACKAGES} ]]; then \/usr\/local\/bin\/npm install ${NODE_PACKAGES}; fi; if [ -f \/home\/container\/package.json ]; then \/usr\/local\/bin\/npm install --production; fi; \/usr\/local\/bin\/node \/home\/container\/{{BOT_JS_FILE}}", "config": { "files": "{}", "startup": "{\r\n \"done\": \"change this part\"\r\n}", @@ -78,4 +78,4 @@ "rules": "required|string" } ] -} \ No newline at end of file +} From 2b39774da3618e3537dbfb105d7fb750e13f449e Mon Sep 17 00:00:00 2001 From: Michael Parker Date: Tue, 14 Jul 2020 22:16:44 -0400 Subject: [PATCH 23/23] update pocketmine install script resolves #614 --- minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json index 8f0f3877..98a8d1e5 100644 --- a/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json +++ b/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2020-01-24T08:59:24-05:00", + "exported_at": "2020-07-14T22:15:06-04:00", "name": "PocketmineMP", "author": "info@swisscrafting.ch", "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)", @@ -17,9 +17,9 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\r\n\r\napk add --no-cache curl\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7.3 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.3-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", - "container": "alpine:3.10", - "entrypoint": "ash" + "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n downloading pocketmine MP build ${PMMP_VERSION}\"\r\nif [ -z \"$PMMP_VERSION\" ] || [ \"$PMMP_VERSION\" == \"latest\" ]; then\r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/Stable\/artifact\/PocketMine-MP.phar\r\nelse \r\n curl -sSL -o PocketMine-MP.phar https:\/\/jenkins.pmmp.io\/job\/PocketMine-MP\/${PMMP_VERSION}\/artifact\/PocketMine-MP.phar\r\nfi\r\n\r\necho -e \"\\n downloading latest php7.3 build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-7.3-Linux-x86_64\/lastSuccessfulBuild\/artifact\/PHP_Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php7 binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing pvp7 packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.tx banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs", + "container": "debian:buster-slim", + "entrypoint": "bash" } }, "variables": [