From 409dba25cb7d1767bbca0b3e47ce0a8e5324b468 Mon Sep 17 00:00:00 2001 From: Cibb Date: Sun, 14 Mar 2021 14:16:37 -0300 Subject: [PATCH 1/3] fix: remove hardcoded database name --- zombieoutbreak.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/zombieoutbreak.sql b/zombieoutbreak.sql index 9789bc8..5ba196b 100644 --- a/zombieoutbreak.sql +++ b/zombieoutbreak.sql @@ -1,6 +1,3 @@ -CREATE DATABASE IF NOT EXISTS `zombieoutbreak`; -USE `zombieoutbreak`; - CREATE TABLE `users` ( `ID` INT NOT NULL AUTO_INCREMENT, `Identifier` VARCHAR(50) NOT NULL, From c45e6767b5f1bd21b2184c3ce90d1baf155ef38a Mon Sep 17 00:00:00 2001 From: Cibb Date: Sun, 14 Mar 2021 14:21:56 -0300 Subject: [PATCH 2/3] feat: Add txAdminRecipe folder --- txAdminRecipe/recipe.yaml | 39 +++++++++++++++++++++++++++++++++++++++ txAdminRecipe/server.cfg | 27 +++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 txAdminRecipe/recipe.yaml create mode 100644 txAdminRecipe/server.cfg diff --git a/txAdminRecipe/recipe.yaml b/txAdminRecipe/recipe.yaml new file mode 100644 index 0000000..a935397 --- /dev/null +++ b/txAdminRecipe/recipe.yaml @@ -0,0 +1,39 @@ +$engine: 2 +name: ZombieOutbreak +version: v1.0.0 +author: Dislaik +description: Zombie Survival RPG for FiveM! + +tasks: + # Download default CFX resources + - action: download_github + src: https://github.com/citizenfx/cfx-server-data + ref: 88f4f974b855e0bf2ca5f51b9916648bd5b7d44b + subpath: resources + dest: ./resources + + # Download and prepare server.cfg / loadingscreen / database + - action: download_github + src: https://github.com/cibb/zombieoutbreak + ref: txRecipe + subpath: zombieoutbreak + dest: ./tmp/zombieoutbreak + + - action: move_path + src: ./tmp/zombieoutbreak/txAdminRecipe/server.cfg + dest: ./server.cfg + + - action: connect_database + - action: query_database + file: ./tmp/zombieoutbreak/zombieoutbreak.sql + + # Download dependencies + + - action: download_github + src: https://github.com/brouznouf/fivem-mysql-async + ref: c5fa317a65acfe2eef453257e19e3b4fde137089 + dest: ./resources/mysql-async + + ## Final touches + - action: remove_path + path: ./tmp \ No newline at end of file diff --git a/txAdminRecipe/server.cfg b/txAdminRecipe/server.cfg new file mode 100644 index 0000000..ff14658 --- /dev/null +++ b/txAdminRecipe/server.cfg @@ -0,0 +1,27 @@ +## You CAN edit the following: +endpoint_add_tcp "0.0.0.0:30120" +endpoint_add_udp "0.0.0.0:30120" +sv_maxclients 48 +set steam_webApiKey "none" +sets tags "default, deployer, plume esx" + +## You MAY edit the following: +sv_hostname "{{serverName}} built with {{recipeName}} by {{recipeAuthor}}!" +sv_licenseKey "{{svLicense}}" +sets locale "root-AQ" +set mysql_connection_string "{{dbConnectionString}}" + +## These resources will start by default. +ensure mapmanager +ensure chat +ensure spawnmanager +ensure sessionmanager +ensure rconlog +ensure baseevents +ensure mysql-async +ensure zombieoutbreak + +## Add system admins +add_ace group.admin command allow # allow all commands +add_ace group.admin command.quit deny # but don't allow quit +{{addPrincipalsMaster}} \ No newline at end of file From 921e7c1b50da795c0f0f4fb2360cf0ed51ef3232 Mon Sep 17 00:00:00 2001 From: Cibb Date: Sun, 14 Mar 2021 14:38:30 -0300 Subject: [PATCH 3/3] fix: Replace repository URL --- txAdminRecipe/recipe.yaml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/txAdminRecipe/recipe.yaml b/txAdminRecipe/recipe.yaml index a935397..a9c388d 100644 --- a/txAdminRecipe/recipe.yaml +++ b/txAdminRecipe/recipe.yaml @@ -14,26 +14,21 @@ tasks: # Download and prepare server.cfg / loadingscreen / database - action: download_github - src: https://github.com/cibb/zombieoutbreak - ref: txRecipe - subpath: zombieoutbreak - dest: ./tmp/zombieoutbreak + src: https://github.com/Dislaik/zombieoutbreak + ref: main + dest: ./resources/zombieoutbreak - action: move_path - src: ./tmp/zombieoutbreak/txAdminRecipe/server.cfg + src: ./resources/zombieoutbreak/txAdminRecipe/server.cfg dest: ./server.cfg - action: connect_database - action: query_database - file: ./tmp/zombieoutbreak/zombieoutbreak.sql + file: ./resources/zombieoutbreak/zombieoutbreak.sql # Download dependencies - action: download_github src: https://github.com/brouznouf/fivem-mysql-async ref: c5fa317a65acfe2eef453257e19e3b4fde137089 - dest: ./resources/mysql-async - - ## Final touches - - action: remove_path - path: ./tmp \ No newline at end of file + dest: ./resources/mysql-async \ No newline at end of file