Skip to content

Commit faefdbf

Browse files
committed
Merge branch 'develop'
2 parents 04f5a97 + 867789b commit faefdbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1059
-772
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ services:
1616
- PASSWORD_HASH_KEY=!CHangeMe!
1717
- IV_HASH=!CHangeMe!
1818
- DATABASE_URL=postgresql://user:pass@postgres:5432/gsm?serverVersion=16&charset=utf8
19-
- TZ=Europe/Paris
19+
- TZ=Europe/Paris #default => America/Los_Angeles
20+
- APP_LANG=fr #default => en
2021
depends_on:
2122
- postgres
2223
ports:
@@ -36,12 +37,12 @@ The project has been designed to run under docker with frankenphp, if you want t
3637
"class": "Runtime\\FrankenPhpSymfony\\Runtime"
3738
}
3839
```
39-
# Cron jobs
40+
# Cronjobs
4041
You have a cron job for game servers verification that runs every 5 minutes directly in the container.
4142

42-
You can run up to 3 cron jobs commands to manage updates and restarts of your game servers from the interface.
43+
You can run up to 3 cronjobs commands to manage updates and restarts of your game servers from the interface.
4344

44-
If you want to manage cron jobs outside the application, you can add them like this:
45+
If you want to manage cronjobs outside the application, you can add them like this:
4546
```
4647
0 4 * * * docker exec <container_app> php bin/console cron:server:stop <id_game_server> >> /var/log/cron.log 2>&1
4748
1 4 * * * docker exec <container_app> php bin/console cron:server:update <id_game_server> --time=120 >> /var/log/cron.log 2>&1
@@ -51,3 +52,4 @@ If you want to manage cron jobs outside the application, you can add them like t
5152
# Importante notes
5253
- You need to install your game server before adding it to GSM.
5354
- If the gsm container is refreshed, the cronjobs present in the base will be added to the container's crontab.
55+
- Need to add your language? Don't hesitate to contribute with a pull request!

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"php": ">=8.2",
88
"ext-ctype": "*",
99
"ext-iconv": "*",
10-
"divineomega/php-ssh-connection": "^2.2",
1110
"doctrine/doctrine-bundle": "^2.11",
1211
"doctrine/doctrine-migrations-bundle": "^3.3",
1312
"doctrine/orm": "^2.17",
1413
"phpdocumentor/reflection-docblock": "^5.3",
14+
"phpseclib/phpseclib": "^3.0",
1515
"runtime/frankenphp-symfony": "^0.1.1",
1616
"symfony/asset": "6.4.*",
1717
"symfony/console": "6.4.*",

0 commit comments

Comments
 (0)