Merge branch 'hotfix/2025-01-16_static_pages'

cms/pages/apply/publisher-responsibilities.md

@@ -78,7 +78,6 @@ On [your dashboard](/publisher/), you can
 - See [a list of your journals](/publisher/journal) indexed in DOAJ
 - [Submit an update request](/publisher-responsibilities/#keeping-your-journal-records-up-to-date) when journal details change
 - [Upload](/publisher/uploadfile) or [enter](/publisher/metadata) article metadata for your journals
-- Download the Seal logo (only for journals awarded the DOAJ Seal).
 - Upload your full-text content (only for journals preserved via JASPER).
 
 ### Settings
@@ -105,20 +104,18 @@ If you don’t get the email, check your Spam folder and which address you regis
 
 ### Displaying the DOAJ logo
 
-To show that your journal is indexed in DOAJ or has the DOAJ Seal:
+To show that your journal is indexed in DOAJ:
 
-- You may use the DOAJ or the Seal logo on your journal's website but not on individual articles
-- You may only use the DOAJ or Seal logo on a platform or portal website if all of the platform's journals are indexed or have been awarded the Seal
+- You may use the DOAJ logo on your journal's website but not on individual articles
+- You may only use the DOAJ logo on a platform or portal website if all of the platform's journals are indexed
 - You can [download the DOAJ logos](https://doaj-kit.netlify.app/building-blocks/logotype/)
-- If awarded, you can download the Seal logo from [your publisher dashboard](/publisher/journal)
 
 We have [guidelines](https://doaj-kit.netlify.app/building-blocks/logotype/) about how you can use our logo on your website or in printed material.
 
 ### Keeping your journal records up to date
 When something changes, you must keep your journal records in DOAJ up to date.
 
 - [Contact our Help Desk](mailto:[email protected]) if you want to change the Title or ISSN of your journal, but [read this section first](/apply/publisher-responsibilities/#journal-title-changes-mergers-or-continuations).
-- [Contact our Help Desk](mailto:[email protected]) if your journal qualifies for the Seal.
 - Request a CSV file from us that allows you to update multiple journals and values at the same time and in spreadsheet format.
 - For all other changes, log into your DOAJ account to [submit an update request](/publisher/journal). Use the black ‘Update’ button.
 

cms/pages/docs/faq.md

@@ -195,7 +195,8 @@ From time to time, other validation errors might be seen if one of the cells con
 
 ## Version history
 
-This is Version 2 of our Metadata help page.
+This is Version 3 of our Metadata help page.
 
-*Version 2.0 (December 2023 - added the entire 'Using a spreadsheet to update your journal metadata' section)*<br>
+*Version 3.0 (January 2025 - added a new section: 'Correcting or updating article metadata')*<br>
+<s>Version 2.0 (December 2023 - added the entire 'Using a spreadsheet to update your journal metadata' section)</s><br>
 <s>Version 1.0 (November 2023 - created this whole page with new content)</s><br>

deploy/doaj_test_gunicorn_config.py

@@ -13,4 +13,4 @@
 max_requests_jitter = 100
 
 timeout = 40
-graceful_timeout = 40
+graceful_timeout = 40

deploy/nginx/test/doaj

@@ -24,10 +24,6 @@ upstream doaj_apps {
     server localhost:5050;
 }
 
-upstream doaj_static {
-    server localhost:5051;
-}
-
 upstream doaj_index {
     server localhost:9200;
 }
@@ -38,6 +34,12 @@ map $request_uri $new_uri {
     include /etc/nginx/doaj-redirects.map;
 }
 
+# Redirect the old URL for the static site to the current one
+server {
+    server_name  .staticdoaj.cottagelabs.com;
+    rewrite      ^ https://static.doaj.cottagelabs.com$request_uri? permanent;
+}
+
 server {
     listen          443 ssl;
     server_name     testdoaj.cottagelabs.com;
@@ -72,40 +74,6 @@ server {
     }
 }
 
-server {
-    listen          443 ssl;
-    server_name     staticdoaj.cottagelabs.com;
-
-    # Separate doajtest app htpasswd file to include additional users
-    #auth_basic "Restricted";
-    #auth_basic_user_file /etc/nginx/doajtest_users;
-
-    ssl_certificate /etc/letsencrypt/live/testdoaj.cottagelabs.com/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/testdoaj.cottagelabs.com/privkey.pem;
-
-    access_log /var/log/nginx/doaj-static.access.log;
-    error_log /var/log/nginx/doaj-static.error.log;
-
-    proxy_read_timeout 600s;
-    client_max_body_size 50M;
-
-    if ($new_uri != "") {
-        rewrite ^(.*)$ $new_uri permanent;
-    }
-
-    location / {
-        proxy_pass http://doaj_static;
-    }
-    location =/robots.txt {
-        alias /home/cloo/doaj-static/deploy/robots-test.txt;
-    }
-    location /static/ {
-        alias /home/cloo/doaj-static/portality/static/;
-        autoindex off;
-        expires max;
-    }
-}
-
 server {
     listen          443 ssl;
     server_name     testdoajes.cottagelabs.com;