Bump version, update dependencies, match docker configuration with pr…

…od (#891)
RetroAchievements · Dec 27, 2021 · c5133bd · c5133bd
1 parent 9f485e0
commit c5133bd
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 46 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - "--default-authentication-plugin=mysql_native_password"
 
   nginx:
-    image: nginx:1.19
+    image: nginx:1.18
     ports:
       - ${HTTP_PORT}:80
       - ${HTTPS_PORT}:443

diff --git a/lib/constants.php b/lib/constants.php
@@ -1,4 +1,4 @@
 <?php
 
-const VERSION = '1.77.2';
+const VERSION = '1.78.0';
 const MIN_POINTS = 500;
diff --git a/public/gameInfo.php b/public/gameInfo.php
@@ -1085,20 +1085,13 @@ function submitSetRequest(user, gameID) {
             echo "</li>";
 
             if (isset($user)) {
-                echo "<li><a class='info-button' href='/linkedhashes.php?g=$gameID'><span>🔗</span>Hashes linked to this game</a></li>";
-                $numOpenTickets = countOpenTickets(
-                    requestInputSanitized('f') == $unofficialFlag,
-                    requestInputSanitized('t', 16377),
-                    null,
-                    $gameID
-                );
                 if ($permissions >= Permissions::Registered) {
                     echo "<li><a class='info-button' href='/linkedhashes.php?g=$gameID'><span>🔗</span>Linked Hashes</a></li>";
                     echo "<li><a class='info-button' href='/codenotes.php?g=$gameID'><span>📑</span>Code Notes</a></li>";
 
                     $numOpenTickets = countOpenTickets(
                         requestInputSanitized('f') == $unofficialFlag,
-                        requestInputSanitized('t', 2041),
+                        requestInputSanitized('t', 16377),
                         null,
                         $gameID
                     );

diff --git a/resources/docker/nginx/configs/sites-enabled/ra-web.conf b/resources/docker/nginx/configs/sites-enabled/ra-web.conf
@@ -4,8 +4,8 @@ server {
 
     root /srv/web/public;
 
-    access_log /var/log/nginx/access-web-v1.log;
-    error_log  /var/log/nginx/error-web-v1.log warn;
+    access_log /var/log/nginx/web-access.log;
+    error_log  /var/log/nginx/web-error.log warn;
 
     include snippets/ra-web-v1.conf;
 }
diff --git a/resources/docker/nginx/configs/snippets/ra-web-v1.conf b/resources/docker/nginx/configs/snippets/ra-web-v1.conf
@@ -1,7 +1,7 @@
 #charset utf-8;
 override_charset on;
 
-index index.php;
+index index.html index.php;
 
 location / {
     location /Achievement/ {
@@ -41,8 +41,18 @@ location = /robots.txt  { access_log off; log_not_found off; }
 
 location ~* \.(jpg|jpeg|png|gif|ico)$ {
     access_log off;
+    error_log  /var/log/nginx/media-error.log warn;
     expires 365d;
 
+    gzip on;
+    gzip_types application/javascript image/* text/css;
+    gunzip on;
+
+    ## No need to bleed constant updates. Send all the shebang in one fell swoop.
+    tcp_nodelay off;
+
+    try_files $uri $uri/ =404;
+
     # serve default avatar
     location ~* /UserPic/.*\.(png) {
         try_files $uri $uri/ /UserPic/_User.png;
@@ -53,14 +63,24 @@ location ~* \.(jpg|jpeg|png|gif|ico)$ {
 
 location ~* \.(css|js)$ {
     access_log off;
+    error_log  /var/log/nginx/static-error.log warn;
     expires 365d;
+
+    gzip on;
+    gzip_types application/javascript image/* text/css;
+    gunzip on;
+
+    ## No need to bleed constant updates. Send all the shebang in one fell swoop.
+    tcp_nodelay off;
+
+    try_files $uri $uri/ =404;
 }
 
 # api
 
 location /API/ {
-    access_log /var/log/nginx/web-v1-api-access.log;
-    error_log  /var/log/nginx/web-v1-api-error.log warn;
+    access_log /var/log/nginx/api-access.log;
+    error_log  /var/log/nginx/api-error.log warn;
 
     location ~ \.php$ {
         include snippets/fastcgi-php.conf;
@@ -71,23 +91,30 @@ location /API/ {
 # connect
 
 location /LatestIntegration.html {
-    access_log /var/log/nginx/access-web-v1-connect.log;
-    error_log  /var/log/nginx/error-web-v1-connect.log warn;
+    access_log /var/log/nginx/connect-access.log;
+    error_log  /var/log/nginx/connect-error.log warn;
 
     try_files $uri $uri/ =404;
 }
 
 location ~ /bin/.*\.(dll)$ {
-    access_log /var/log/nginx/access-web-v1-connect.log;
-    error_log  /var/log/nginx/error-web-v1-connect.log warn;
+    access_log /var/log/nginx/connect-access.log;
+    error_log  /var/log/nginx/connect-error.log warn;
 
     try_files $uri =404;
 }
 
 location ~ /(login_app|dorequest|doupload)\.php$ {
-    access_log /var/log/nginx/access-web-v1-connect.log;
-    error_log  /var/log/nginx/error-web-v1-connect.log warn;
+    access_log /var/log/nginx/connect-access.log;
+    error_log  /var/log/nginx/connect-error.log warn;
+
+    include snippets/fastcgi-php.conf;
+    fastcgi_pass php:9000;
+}
+
+# site currently active
 
+location ~ /request/user/list-currently-active\.php$ {
     include snippets/fastcgi-php.conf;
     fastcgi_pass php:9000;
 }