Skip to content

Commit

Permalink
Merge branch 'parkervcp:master' into add/reposilite
Browse files Browse the repository at this point in the history
  • Loading branch information
zlataovce authored Jun 12, 2022
2 parents 9d0ea53 + 553ef87 commit 351ea12
Show file tree
Hide file tree
Showing 36 changed files with 1,290 additions and 922 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ If you are reading this it looks like you are looking to add an egg to your serv

[League Sandbox](game_eggs/leaguesandbox)

* [League Sandbox](game_eggs/leaguesandbox/leaguesandbox)

[Minetest](game_eggs/minetest) (including MTG)

* [Minetest](game_eggs/minetest/minetest)
Expand Down Expand Up @@ -157,7 +155,6 @@ If you are reading this it looks like you are looking to add an egg to your serv
* [SpongeForge](game_eggs/minecraft/java/spongeforge)
* [SpongeVanilla](game_eggs/minecraft/java/spongevanilla)
* [Technic](game_eggs/minecraft/java/technic)
* [Tuinity](game_eggs/minecraft/java/tuinity)
* [VanillaCord](game_eggs/minecraft/java/vanillacord)

* [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies
Expand Down Expand Up @@ -193,13 +190,15 @@ If you are reading this it looks like you are looking to add an egg to your serv
* [ARK: Survival Evolved](game_eggs/steamcmd_servers/ark_survival_evolved)
* [Arma](game_eggs/steamcmd_servers/arma)
* [Arma 3](game_eggs/steamcmd_servers/arma/arma3)
* [Arma Reforger](game_eggs/steamcmd_servers/arma/arma_reforger)
* [Assetto Corsa](game_eggs/steamcmd_servers/assetto_corsa)
* [Avorion](game_eggs/steamcmd_servers/avorion)
* [Barotrauma](game_eggs/steamcmd_servers/barotrauma)
* [Citadel: Forged with Fire](game_eggs/steamcmd_servers/citadel)
* [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles)
* [Craftopia](game_eggs/steamcmd_servers/craftopia)
* [Cryofall](game_eggs/steamcmd_servers/cryofall)
* [DayZ (Experimental)](game_eggs/steamcmd_servers/dayz-experimental)
* [Don't Starve Together](game_eggs/steamcmd_servers/dont_starve)
* [ECO](game_eggs/steamcmd_servers/eco)
* [Fistful of Frags](game_eggs/steamcmd_servers/fof)
Expand All @@ -208,8 +207,8 @@ If you are reading this it looks like you are looking to add an egg to your serv
* [Hurtworld](game_eggs/steamcmd_servers/hurtworld)
* [Insurgency: Sandstorm](game_eggs/steamcmd_servers/insurgency_sandstorm)
* [Killing Floor 2](game_eggs/steamcmd_servers/killing_floor_2)
* [Left 4 Dead](game_eggs/steamcdm_servers/left4dead)
* [Left 4 Dead 2](game_eggs/steamcdm_servers/left4dead_2)
* [Left 4 Dead](game_eggs/steamcmd_servers/left4dead)
* [Left 4 Dead 2](game_eggs/steamcmd_servers/left4dead_2)
* [Modiverse](game_eggs/steamcmd_servers/modiverse)
* [Mordhau](game_eggs/steamcmd_servers/mordhau)
* [No More Room in Hell](game_eggs/steamcmd_servers/nmrih)
Expand Down Expand Up @@ -240,6 +239,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
* [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic)
* [Tower Unite](game_eggs/steamcmd_servers/tower_unite)
* [Unturned](game_eggs/steamcmd_servers/unturned)
* [V Rising](game_eggs/steamcmd_servers/v_rising)
* [Valheim](game_eggs/steamcmd_servers/valheim)
* [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla)
* [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus)
Expand All @@ -266,6 +266,8 @@ If you are reading this it looks like you are looking to add an egg to your serv

[Xonotic](game_eggs/xonotic/xonotic)

[FoundryVTT](game_eggs/FoundryVTT)

## [Monitoring](/monitoring/)

### Prometheus
Expand Down
4 changes: 2 additions & 2 deletions bots/discord/jmusicbot/egg-j-music-bot.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"default_value": "You need to get a token",
"user_viewable": true,
"user_editable": true,
"rules": "required|string|max:64"
"rules": "required|string"
},
{
"name": "[REQUIRED] Bot Owner ID",
Expand Down Expand Up @@ -127,4 +127,4 @@
"rules": "required|integer"
}
]
}
}
57 changes: 22 additions & 35 deletions database/sql/postgres/egg-postgres.json
Original file line number Diff line number Diff line change
@@ -1,62 +1,49 @@
{
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
"meta": {
"version": "PTDL_v1"
"version": "PTDL_v1",
"update_url": null
},
"exported_at": "2020-03-04T09:53:34-05:00",
"exported_at": "2022-05-08T21:54:05+02:00",
"name": "Postgres",
"author": "[email protected]",
"description": "A default Postgres install that is not really editable.",
"image": "quay.io\/parkervcp\/pterodactyl-images:db_postgres",
"features": null,
"images": [
"ghcr.io\/parkervcp\/yolks:postgres_14"
],
"file_denylist": [],
"startup": "postgres -D \/home\/container\/postgres_db\/",
"config": {
"files": "{\r\n \"postgres_db\/postgresql.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n\t\t \"#port =\": \"port = {{server.build.default.port}}\",\r\n \"#external_pid_file =\": \"external_pid_file = '\/home\/container\/postgres_db\/run\/postgres.pid'\",\r\n \"#unix_socket_directories =\": \"unix_socket_directories = '\/home\/container\/postgres_db\/run\/'\"\r\n }\r\n }\r\n}",
"files": "{\r\n \"postgres_db\/postgresql.conf\": {\r\n \"parser\": \"file\",\r\n \"find\": {\r\n \"#port =\": \"port = {{server.build.default.port}}\",\r\n \"#external_pid_file =\": \"external_pid_file = '\/home\/container\/postgres_db\/run\/postgres.pid'\",\r\n \"#unix_socket_directories =\": \"unix_socket_directories = '\/home\/container\/postgres_db\/run\/'\"\r\n }\r\n }\r\n}",
"startup": "{\r\n \"done\": \"database system is ready to accept connections\"\r\n}",
"logs": "{}",
"stop": "^C"
},
"scripts": {
"installation": {
"script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\necho $POSTGRES_PASSWORD > .passwd\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\ncat .passwd\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U container --pwfile .passwd'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\necho -e \"Done\"",
"container": "postgres:13.1-alpine",
"entrypoint": "ash"
"script": "#! \/bin\/ash\r\nadduser -D -h \/home\/container container\r\n\r\nchown -R container: \/mnt\/server\/\r\n\r\nsu container -c 'initdb -D \/mnt\/server\/postgres_db\/ -A md5 -U \"$PGUSER\" --pwfile=<(echo \"$PGPASSWORD\")'\r\n\r\nmkdir -p \/mnt\/server\/postgres_db\/run\/\r\n\r\n## Add default \"allow from all\" auth rule to pg_hba\r\nif ! grep -q \"# Custom rules\" \"\/mnt\/server\/postgres_db\/pg_hba.conf\"; then\r\n echo -e \"# Custom rules\\nhost all all 0.0.0.0\/0 md5\" >> \"\/mnt\/server\/postgres_db\/pg_hba.conf\"\r\nfi\r\n\r\necho -e \"Done\"",
"container": "postgres:14-alpine",
"entrypoint": "bash"
}
},
"variables": [
{
"name": "Database Password",
"description": "The Postgres user password that can be changed and should change on server restart.",
"env_variable": "PGPASSWORD",
"default_value": "P@55word",
"user_viewable": 1,
"user_editable": 1,
"rules": "required|string|max:20"
},
{
"name": "SuperUser Password",
"description": "The postgres super user password with a strong default.\r\nYou should be generating new ones for each server.\r\nIf you don't then users can hit other users DB's",
"env_variable": "PGROOT",
"default_value": "ZPWgpMN4hETqjXAV",
"user_viewable": 1,
"user_editable": 0,
"rules": "required|string|max:20"
},
{
"name": "Postgres User",
"description": "The user for the postgres database",
"name": "Superuser Name",
"description": "The username for the postgres superuser",
"env_variable": "PGUSER",
"default_value": "pterodactyl",
"user_viewable": 1,
"user_editable": 0,
"user_viewable": true,
"user_editable": false,
"rules": "required|string|max:20"
},
{
"name": "Postgres Database",
"description": "The postgres database the user will have access too.",
"env_variable": "PGDATABASE",
"default_value": "pterodactyl",
"user_viewable": 1,
"user_editable": 0,
"name": "Superuser Password",
"description": "The postgres super user password with a strong default.\r\nYou should be generating new ones for each server.\r\nIf you don't then users can hit other users DB's",
"env_variable": "PGPASSWORD",
"default_value": "Pl3453Ch4n63M3!",
"user_viewable": true,
"user_editable": false,
"rules": "required|string|max:20"
}
]
Expand Down
Loading

0 comments on commit 351ea12

Please sign in to comment.