AsgardEternal/Ubuntu-Ansible-Setup
1
0
Fork 0
mirror of https://github.com/AsgardEternal/Ubuntu-Ansible-Setup.git synced 2024-09-28 09:24:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct variables for mysql, server_ids

Browse Source
This commit is contained in:
Price Hiller 2023-02-03 18:37:03 -06:00
parent adf1baddf9
commit 97931611d2
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inventory.yml
View File

@ -8,6 +8,12 @@ all:
ansible_user: asgard
squad_server_user: asgard
squad_server_group: asgard
squad_mysql:
user: "squadjs"
user_password: "{{ lookup('ansible.builtin.env', 'SQUAD_MYSQL_ROOT_PASSWORD' )}}"
root_password: "{{ lookup('ansible.builtin.env', 'SQUAD_MYSQL_ROOT_PASSWORD' )}}"
database: squadjs
squad_default_settings:
server_id: 0 # As a note, server IDs must be started at 1!
docker:

4
roles/squad-server/templates/SquadJS.mee-french.json.j2
View File

@ -1,6 +1,6 @@
{
"server": {
"id": {{ server_id }},
"id": {{ server.server_id }},
"host": "squad",
"queryPort": {{ server.ports.query }},
"rconPort": {{ server.ports.rcon }},
@ -77,7 +77,7 @@
"plugin": "DBLog",
"enabled": true,
"database": "mysql",
"overrideServerID": {{ server_id }}
"overrideServerID": {{ server.server_id }}
},
{
"plugin": "DiscordAdminBroadcast",

4
roles/squad-server/templates/SquadJS.vanilla.json.j2
View File

@ -1,6 +1,6 @@
{
"server": {
"id": {{ server_id }},
"id": {{ server.server_id }},
"host": "squad",
"queryPort": {{ server.ports.query }},
"rconPort": {{ server.ports.rcon }},
@ -78,7 +78,7 @@
"plugin": "DBLog",
"enabled": true,
"database": "mysql",
"overrideServerID": {{ server_id }}
"overrideServerID": {{ server.server_id }}
},
{
"plugin": "DiscordAdminBroadcast",

8
roles/squad-server/templates/docker-compose.yml.j2
View File

@ -73,10 +73,10 @@ services:
command: --sql-mode:TRADITIONAL
restart: unless-stopped
environment:
MYSQL_ROOT_PASSWORD: {{ server.secrets.rcon_password }}
MYSQL_DATABASE: squadjs
MYSQL_USER: "'squadjs'@'%'"
MYSQL_PASSWORD: {{ server.secrets.rcon_password }}
MYSQL_ROOT_PASSWORD: {{ squad_mysql.root_password }}
MYSQL_DATABASE: {{ squad_mysql.database }}
MYSQL_USER: "'{{ squad_mysql.user }}'@'%'"
MYSQL_PASSWORD: {{ squad_mysql.user_password }}
volumes:
- mysql-data:/var/lib/mysql:rw
ports: