2.3 final updates

superdesk · Jun 16, 2023 · 1d5574f · 1d5574f
1 parent b59c154
commit 1d5574f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 5 deletions.
diff --git a/.env.local.example b/.env.local.example
@@ -1,3 +1,5 @@
+#APP_ENV=prod
+#APP_DEBUG=0
 APP_ENV=dev
 APP_DEBUG=1
 APP_SECRET=CHANGEME
@@ -14,6 +16,19 @@ ELASTICA_PORT=9200
 ELASTICA_INDEX_NAME=swp_index-docker
 WEBP_CONVERSION_ENABLED=true
 FS_MAIN_ADAPTER=local_adapter
+#AWS config
+#FS_MAIN_ADAPTER=aws_adapter
+#FS_AWS_S3_VERSION=latest
+#FS_AWS_S3_REGION=
+#FS_AWS_S3_KEY=
+#FS_AWS_S3_SECRET=
+#FS_AWS_S3_PREFIX=
+#FS_AWS_S3_BUCKET=
+#GCP config
+#FS_MAIN_ADAPTER=gcs_adapter
+#FS_GOOGLE_CREDENTIALS=google_credentials.json
+#FS_GOOGLE_BUCKET=
+#FS_GOOGLE_PROJECT_ID=
 CACHE_SERVERS='["localhost"]'
 SESSION_MEMCACHED_HOST=memcached
 SESSION_MEMCACHED_PORT=11211
@@ -37,4 +52,7 @@ EXTERNAL_OAUTH_CLIENT_SECRET=
 EXTERNAL_OAUTH_BASE_URL=
 PUBLIC_SUFFIX_LIST_ENDPOINT=https://publicsuffix.org/list/public_suffix_list.dat
 PUBLIC_SUFFIX_LIST_FILENAME=public_suffix_list.dat
+#SLUG_REGEX=
+###> symfony/messenger ###
+MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ This changelog references the relevant changes (bug and security fixes).
 
 To get the diff for a specific change, go to https://github.com/superdesk/web-publisher/commit/XXX where XXX is the change hash
 
+## 2.3
+
+* migration to PHP 8.0
+* native Google Cloud Storage support
+* slug change in Superdesk now affects article slug in the Publisher by default (with automatic redirection already available)
+* changing category covered by publishing rule now updates article URL
+* category change resulting article URL change is now addressed with proper redirection
+* introducing `SLUG_REGEX` environment variable for handling slug duplication criteria
+* fix for custom redirections
+* fix for sorting articles by creating time in the Output control
+* fix for the Error log view in the Publisher admin interface
+* .env.(local.)example updates with AWS S3 and Google Cloud Storage configuration templates
+
 ## 2.2
 
 * migration to Symfony 5

diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md
@@ -1,4 +1,4 @@
- * PHP >= 7.4
+ * PHP = 8.0
    * iconv needs to be enabled
    * Intl needs to be installed with ICU 4+
    * pdo needs to be enabled

diff --git a/etc/docker/.env.example b/etc/docker/.env.example
@@ -1,3 +1,5 @@
+#APP_ENV=prod
+#APP_DEBUG=0
 APP_ENV=dev
 APP_DEBUG=1
 APP_SECRET=CHANGEME
@@ -13,6 +15,19 @@ ELASTICA_HOST=elasticsearch
 ELASTICA_PORT=9200
 ELASTICA_INDEX_NAME=swp_index-docker
 FS_MAIN_ADAPTER=local_adapter
+#AWS config
+#FS_MAIN_ADAPTER=aws_adapter
+#FS_AWS_S3_VERSION=latest
+#FS_AWS_S3_REGION=
+#FS_AWS_S3_KEY=
+#FS_AWS_S3_SECRET=
+#FS_AWS_S3_PREFIX=
+#FS_AWS_S3_BUCKET=
+#GCP config
+#FS_MAIN_ADAPTER=gcs_adapter
+#FS_GOOGLE_CREDENTIALS=google_credentials.json
+#FS_GOOGLE_BUCKET=
+#FS_GOOGLE_PROJECT_ID=
 CACHE_SERVERS=["localhost"]
 SESSION_MEMCACHED_HOST=memcached
 SESSION_MEMCACHED_PORT=11211
@@ -34,5 +49,8 @@ JWT_PASSPHRASE=1234
 EXTERNAL_OAUTH_CLIENT_ID=
 EXTERNAL_OAUTH_CLIENT_SECRET=
 EXTERNAL_OAUTH_BASE_URL=
+PUBLIC_SUFFIX_LIST_ENDPOINT=https://publicsuffix.org/list/public_suffix_list.dat
+PUBLIC_SUFFIX_LIST_FILENAME=public_suffix_list.dat
+#SLUG_REGEX=
 ###> symfony/messenger ###
 MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
diff --git a/etc/docker/Superdesk.md b/etc/docker/Superdesk.md
@@ -88,11 +88,11 @@ If you want to use AWS S3 or Google Cloud Storage, add the following lines to ``
 
 ```
       - AMAZON_SERVE_DIRECT_LINKS=True
-      - AMAZON_ENDPOINT_URL=https://storage.googleapis.com
-      - AMAZON_ACCESS_KEY_ID=GOOGATXA6IMK7B7NJ5LW55TJ
-      - AMAZON_SECRET_ACCESS_KEY=qZjFYbipnzvUg6o2MwKZNroXXAm9mMw5m3XbJcb/
+      - AMAZON_ENDPOINT_URL=
+      - AMAZON_ACCESS_KEY_ID=
+      - AMAZON_SECRET_ACCESS_KEY=
       - AMAZON_REGION=auto
-      - AMAZON_CONTAINER_NAME=brasil-gcc-test-bucket
+      - AMAZON_CONTAINER_NAME=
 ```