Merge pull request #657 from Lan2Play/dev

fix env_override and add explanation & fix rounds in pugsharp

.env.example

@@ -26,7 +26,7 @@ ENABLE_HTTPS=false
 FORCE_APP_HTTPS=false
 # HTTPS Only Cookies - By setting this option to true, session cookies will only be sent back to the server if the browser has a HTTPS connection. This will keep the cookie from being sent to you if it can not be done securely.
 SESSION_SECURE_COOKIE=false
-# ENV Overide If set to true, the App will take its API Keys from the ENV instead of the database. This includes Paypal, Stripe, Facebook, Challonge, Google Analytics, Facebook Analytics and Steam. With the default setting, you have to configure those credentials below.
+# ENV Overide If set to true, the App will take its API Keys from the ENV instead of the database. This includes Paypal, Stripe, Facebook, Challonge, Google Analytics, Facebook Analytics and Steam. With the default setting, you have to configure those credentials in the admin menu.
 ENV_OVERRIDE=false
 
 
@@ -119,6 +119,13 @@ TIMEZONE=Europe/Berlin
 TZ=Europe/Berlin
 
 
+#################################################################################################################################
+#################################################################################################################################
+## Warning: if you want to configure any API credentials below, you have to set ENV_OVERRIDE=true under the App Settings above ##
+#################################################################################################################################
+#################################################################################################################################
+
+
 #######################
 ## Payment Providers ##
 #######################

.github/workflows/test_and_build.yml

@@ -45,7 +45,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build Linux Image
         if: ${{ github.event_name == 'pull_request' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./Dockerfile
@@ -62,7 +62,7 @@ jobs:
           push: false      
       - name: Build and push Linux Image
         if: ${{ startsWith(github.ref, 'refs/heads/master') && github.event_name == 'push' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./Dockerfile
@@ -79,7 +79,7 @@ jobs:
           push: true
       - name: Build and push Linux Image dev
         if: ${{ startsWith(github.ref, 'refs/heads/dev') && github.event_name == 'push' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./Dockerfile

docs/source/admin/getting_started.rst

@@ -49,7 +49,7 @@ create a folder where you put your .environment and your docker compose file in.
 
 Then create the ``.env`` file. 
 
-Fill in the APP_KEY from the last step and all other empty Variables (if not optional ones).
+Fill in the APP_KEY from the last step and all other empty Variables (if not optional ones). By default you have to set your API keys in your Admin interface, so you don't have to insert them here. If you want that instead, you have to set ``ENV_OVERRIDE=true`` in your App Settings below.
 
 .. code-block:: bash
 
@@ -79,8 +79,8 @@ Fill in the APP_KEY from the last step and all other empty Variables (if not opt
     FORCE_APP_HTTPS=true
     # HTTPS Only Cookies - By setting this option to true, session cookies will only be sent back to the server if the browser has a HTTPS connection. This will keep the cookie from being sent to you if it can not be done securely.
     SESSION_SECURE_COOKIE=true
-    # ENV Overide If set to true, the App will take its API Keys from the ENV instead of the database. This includes Paypal, Stripe, Facebook, Challonge, Google Analytics, Facebook Analytics and Steam. With the default setting, you have to configure those credentials below.
-    ENV_OVERRIDE=true
+    # ENV Overide If set to true, the App will take its API Keys from the ENV instead of the database. This includes Paypal, Stripe, Facebook, Challonge, Google Analytics, Facebook Analytics and Steam. With the default setting, you have to configure those credentials in the admin menu.
+    ENV_OVERRIDE=false
 
 
     #######################
@@ -172,6 +172,12 @@ Fill in the APP_KEY from the last step and all other empty Variables (if not opt
     TZ=Europe/Berlin
 
 
+    #################################################################################################################################
+    #################################################################################################################################
+    ## Warning: if you want to configure any API credentials below, you have to set ENV_OVERRIDE=true under the App Settings above ##
+    #################################################################################################################################
+    #################################################################################################################################
+
     #######################
     ## Payment Providers ##
     #######################

src/app/GameMatchApiHandler.php

@@ -318,8 +318,8 @@ public function __construct()
             "de_overpass",
             "de_ancient"
         );
-        $this->result->max_rounds = 5;
-        $this->result->max_overtime_rounds = 2;
+        $this->result->max_rounds = 24;
+        $this->result->max_overtime_rounds = 6;
     }
 
     public function getuserthirdpartyrequirements()