From faafee3cbe6e8404e51f6b29a53c3fbf73a5a579 Mon Sep 17 00:00:00 2001 From: zaphkito Date: Sat, 14 Jun 2025 05:18:11 +0800 Subject: [PATCH 1/3] docker: add nginx in docker compose file --- docker-compose.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6a35355..51f4296 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: volumes: - ./aime:/app/aime - ./configs/config:/app/config + - ./cert:/app/cert environment: CFG_DEV: 1 @@ -14,7 +15,8 @@ services: CFG_CORE_MEMCACHED_HOSTNAME: ma.memcached CFG_CORE_AIMEDB_KEY: CFG_CHUNI_SERVER_LOGLEVEL: debug - + + ##Note: comment 80 and 8443 when you plan to use with nginx ports: - "80:80" - "8443:8443" @@ -64,3 +66,18 @@ services: ports: - "9090:8080" + ##Note: uncomment to allow use nginx with artemis, don't forget to comment 80 and 8443 ports on artemis + # nginx: + # hostname: ma.nginx + # image: nginx:latest + # ports: + # - "80:80" + # - "443:443" + # - "8443:8443" + # volumes: + ##Note: copy example_config/example_nginx.conf to configs/nginx folder, edit it and rename to nginx.conf + # - ./configs/nginx:/etc/nginx/conf.d + # - ./cert:/etc/nginx/cert + # - ./logs/nginx:/var/log/nginx + # depends_on: + # - app \ No newline at end of file From d8bd26d16ea647a3413302263ff0b2fc192a5e41 Mon Sep 17 00:00:00 2001 From: zaphkito Date: Sat, 14 Jun 2025 05:29:25 +0800 Subject: [PATCH 2/3] nginx: add WAHLAP billing in example config file --- example_config/nginx_example.conf | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/example_config/nginx_example.conf b/example_config/nginx_example.conf index b01a822..5823ba4 100644 --- a/example_config/nginx_example.conf +++ b/example_config/nginx_example.conf @@ -66,6 +66,52 @@ server { } } +# WAHLAP Billing, they use 443 port +# comment this out if running billing standalone +# still not work for some reason, please set +# billing=127.0.0.1 in segatools.ini for now and looking for fix +server { + listen 443 ssl; + server_name bl.sys-all.cn; + + ssl_certificate /path/to/cert/server.pem; + ssl_certificate_key /path/to/cert/server.key; + ssl_session_timeout 1d; + ssl_session_cache shared:MozSSL:10m; + ssl_session_tickets off; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_ciphers "ALL:@SECLEVEL=0"; + ssl_prefer_server_ciphers off; + + location / { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_request_headers on; + proxy_pass http://127.0.0.1:8080/; + } +} + +server { + listen 443 ssl; + server_name bl.sys-allnet.cn; + + ssl_certificate /path/to/cert/server.pem; + ssl_certificate_key /path/to/cert/server.key; + ssl_session_timeout 1d; + ssl_session_cache shared:MozSSL:10m; + ssl_session_tickets off; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; + ssl_ciphers "ALL:@SECLEVEL=0"; + ssl_prefer_server_ciphers off; + + location / { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass_request_headers on; + proxy_pass http://127.0.0.1:8080/; + } +} + # Frontend, set to redirect to HTTPS. Comment out if you don't intend to use the frontend server { listen 80; From 4a417f869aa4c249eb7b09a076cedb795874727c Mon Sep 17 00:00:00 2001 From: zaphkito Date: Sat, 14 Jun 2025 05:33:37 +0800 Subject: [PATCH 3/3] docker: a little change --- docker-compose.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 51f4296..beab3a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,17 +67,17 @@ services: - "9090:8080" ##Note: uncomment to allow use nginx with artemis, don't forget to comment 80 and 8443 ports on artemis - # nginx: - # hostname: ma.nginx - # image: nginx:latest - # ports: - # - "80:80" - # - "443:443" - # - "8443:8443" - # volumes: + #nginx: + # hostname: ma.nginx + # image: nginx:latest + # ports: + # - "80:80" + # - "443:443" + # - "8443:8443" + # volumes: ##Note: copy example_config/example_nginx.conf to configs/nginx folder, edit it and rename to nginx.conf - # - ./configs/nginx:/etc/nginx/conf.d - # - ./cert:/etc/nginx/cert - # - ./logs/nginx:/var/log/nginx - # depends_on: - # - app \ No newline at end of file + # - ./configs/nginx:/etc/nginx/conf.d + # - ./cert:/etc/nginx/cert + # - ./logs/nginx:/var/log/nginx + # depends_on: + # - app \ No newline at end of file