Merge branch 'develop' into idac

example_config/chuni.yaml

@@ -2,6 +2,7 @@ server:
   enable: True
   loglevel: "info"
   news_msg: ""
+  use_https: False # for CRYSTAL PLUS and later or SUPERSTAR and later
 
 team:
   name: ARTEMiS # If this is set, all players that are not on a team will use this one by default.
@@ -10,7 +11,7 @@ mods:
   use_login_bonus: True
   # stock_tickets allows specified ticket IDs to be auto-stocked at login. Format is a comma-delimited string of ticket IDs
   # note: quanity is not refreshed on "continue" after set - only on subsequent login
-  stock_tickets: 
+  stock_tickets:
   stock_count: 99
 
   # Allow use of all available customization items in frontend web ui
@@ -18,12 +19,13 @@ mods:
   # warning: This can result in pushing a lot of data, especially the userbox items. Recommended for local network use only.
   forced_item_unlocks:
     map_icons: False
-    system_voices: False  
+    system_voices: False
     avatar_accessories: False
     nameplates: False
     trophies: False
     character_icons: False
-      
+    stages: False
+
 version:
   11:
     rom: 2.00.00
@@ -43,6 +45,12 @@ version:
   16:
     rom: 2.25.00
     data: 2.25.00
+  17:
+    rom: 2.30.00
+    data: 2.30.00
+  18:
+    rom: 2.40.00
+    data: 2.40.00
 
 crypto:
   encrypted_only: False

example_config/core.yaml

@@ -46,6 +46,7 @@ allnet:
   allow_online_updates: False
   update_cfg_folder: ""
   save_billing: True
+  allnet_lite_keys: []
 
 billing:
   standalone: True
@@ -64,5 +65,10 @@ aimedb:
   id_secret: ""
   id_lifetime_seconds: 86400
 
+chimedb:
+  enable: False
+  loglevel: "info"
+  key: ""
+
 mucha:
   loglevel: "info"

example_config/mai2.yaml

@@ -1,12 +1,17 @@
 server:
   enable: True
   loglevel: "info"
+  use_https: False # for DX and later
 
 deliver:
   enable: False
   udbdl_enable: False
   content_folder: ""
 
+chart_deliver: #for Prism and later
+  enable: False
+  chart_folder: ""
+
 uploads:
   photos: False
   photos_dir: ""

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;