change: Move config to env variables.

.env.example

@@ -1,8 +1,9 @@
 ################################################################################
 # Docker images
 ################################################################################
-GAME_IMAGE=git.old-metin2.com/metin2/server:latest
+GAME_IMAGE=git.luisbizarro.com/metin2/server:latest
-WEB_IMAGE=git.old-metin2.com/metin2/web:latest
+WEB_IMAGE=git.luisbizarro.com/metin2/web:latest
+DB_IMAGE=git.luisbizarro.com/metin2/database:latest
 
 ################################################################################
 # Database settings
@@ -11,8 +12,8 @@ DATABASE_HOST=database
 DATABASE_USER=metin2
 DATABASE_PASSWORD=metin2
 DATABASE_PORT=5432
-DATABASE_EXTERNAL_PORT=33065432
+DATABASE_EXTERNAL_PORT=5432
-DATABASE_DATABASE=metin2
+DATABASE_DB=metin2
 
 ################################################################################
 # Web app settings
@@ -40,7 +41,7 @@ WEB_MAIL_FROM_NAME=Metin2
 ################################################################################
 
 # Global settings
-TEST_SERVER=0
+TEST_SERVER=false
 
 # DBCache settings
 DB_ADDR=db
@@ -48,4 +49,33 @@ DB_PORT=15000
 
 # Game settings
 PUBLIC_IP=127.0.0.1
-GAME_MAX_LEVEL=105
+ADMIN_PAGE_IP=127.0.0.1
+ADMIN_PAGE_PASSWORD=
+
+IS_TEST_SERVER=false
+IS_SPEED_SERVER=false
+
+VIEW_RANGE=9000
+USER_LIMIT=850
+PASSES_PER_SEC=25
+CLIENT_HEART_FPS=10
+ITEM_ID_RANGE=10000001 20000000
+
+EMOTE_DUMP_DELAY=900
+PLAYER_CACHE_FLUSH_SECONDS=1800
+ITEM_CACHE_FLUSH_SECONDS=1800
+ITEM_PRICELIST_CACHE_FLUSH_SECONDS=1800
+CACHE_FLUSH_LIMIT_PER_SECOND=10
+
+PLAYER_DELETE_LEVEL_LIMIT=90
+PLAYER_DELETE_LEVEL_LIMIT_LOWER=15
+
+SAVE_EVENT_SECOND_CYCLE=180
+PING_EVENT_SECOND_CYCLE=180
+
+LOG_LEVEL=2 # TRACE 0, DEBUG 1, INFO 2, WARN 3, ERROR 4, CRITICAL 5, OFF 6
+
+# Redis settings
+REDIS_HOST=redis
+REDIS_PASSWORD=metin2
+REDIS_EXTERNAL_PORT=6379

docker-compose.yml

@@ -1,31 +1,3 @@
-x-environment: &common-environment
-  DATABASE_HOST: ${DATABASE_HOST}
-  DATABASE_USER: ${DATABASE_USER}
-  DATABASE_PASSWORD: ${DATABASE_PASSWORD}
-  DATABASE_PORT: ${DATABASE_PORT}
-  DATABASE_DB: ${DATABASE_DB}
-
-  REDIS_HOST: ${REDIS_HOST}
-  REDIS_PASSWORD: ${REDIS_PASSWORD}
-  REDIS_EXTERNAL_PORT: ${REDIS_EXTERNAL_PORT}
-
-  TEST_SERVER: ${TEST_SERVER}
-
-  DATABASE_ADDR: ${DATABASE_ADDR}
-
-  DB_ADDR: ${DB_ADDR}
-  DB_PORT: ${DB_PORT}
-
-  PUBLIC_IP: ${PUBLIC_IP}
-  GAME_MAX_LEVEL: ${GAME_MAX_LEVEL}
-  WEB_APP_URL: ${WEB_APP_URL}
-  WEB_APP_KEY: ${WEB_APP_KEY}
-
-  ADMIN_PAGE_IP: ${ADMIN_PAGE_IP}
-  ADMIN_PAGE_IP1: ${ADMIN_PAGE_IP1}
-  ADMIN_PAGE_IP2: ${ADMIN_PAGE_IP2}
-  ADMIN_PAGE_IP3: ${ADMIN_PAGE_IP3}
-
 name: Metin2
 
 services:
@@ -111,7 +83,8 @@ services:
   db:
     image: ${GAME_IMAGE}
     restart: always
-    environment: *common-environment
+    env_file:
+      - .env
     expose:
       - ${DB_PORT}
     command: db
@@ -128,12 +101,13 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: auth
       GAME_CHANNEL: 1
       GAME_AUTH_SERVER: master
       GAME_PORT: 11000
       GAME_P2P_PORT: 12000
+    env_file:
+      - .env
     expose:
       - 11000
       - 12000
@@ -153,13 +127,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_first
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 1
+      GAME_MARK_SERVER: true
       GAME_PORT: 13000
       GAME_P2P_PORT: 14000
       GAME_MAP_ALLOW: 1 3 4 5 6 21 23 24 25 26 41 43 44 45 46 91 92 93 107 112 201
+    env_file:
+      - .env
     expose:
       - 13000
       - 14000
@@ -179,13 +154,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_game1
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13001
       GAME_P2P_PORT: 14001
       GAME_MAP_ALLOW: 61 62 67 68 72 73 208 351 352 356
+    env_file:
+      - .env
     expose:
       - 13001
       - 14001
@@ -204,13 +180,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_game2
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13002
       GAME_P2P_PORT: 14002
       GAME_MAP_ALLOW: 63 64 65 66 69 70 71 104 108 109 216 217
+    env_file:
+      - .env
     expose:
       - 13002
       - 14002
@@ -229,13 +206,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_game3
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13003
       GAME_P2P_PORT: 14003
       GAME_MAP_ALLOW: 301 302 303 304 353 354 358 359 378 379 380 381
+    env_file:
+      - .env
     expose:
       - 13003
       - 14003
@@ -254,13 +232,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_game4
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13004
       GAME_P2P_PORT: 14004
       GAME_MAP_ALLOW: 373 374 376 377 382 383 384 385 386 387 388 389 390 391 393 394 395
+    env_file:
+      - .env
     expose:
       - 13004
       - 14004
@@ -279,13 +258,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: ch1_game5
       GAME_CHANNEL: 1
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13005
       GAME_P2P_PORT: 14005
       GAME_MAP_ALLOW: 355 357 360 361 362 372 375 396 399 404 405 406 407 408 409 410 411 412 413 414 415 419 420
+    env_file:
+      - .env
     expose:
       - 13005
       - 14005
@@ -305,13 +285,14 @@ services:
     image: ${GAME_IMAGE}
     restart: always
     environment:
-      <<: *common-environment
       GAME_HOSTNAME: game99
       GAME_CHANNEL: 99
-      GAME_MARK_SERVER: 0
+      GAME_MARK_SERVER: false
       GAME_PORT: 13099
       GAME_P2P_PORT: 14099
       GAME_MAP_ALLOW: 81 103 105 110 111 113 114 118 119 120 121 122 123 124 125 126 127 128 130 131 132 133 181 182 183 200 392 363 364 365 366 367 368 369 370 371 400 401 402 403
+    env_file:
+      - .env
     expose:
       - 13099
       - 14099