From 86a1045a47420cb37dd464adb63446bd8b547304 Mon Sep 17 00:00:00 2001 From: "Joseph M. Koning" Date: Mon, 20 Jul 2020 09:47:34 -0700 Subject: [PATCH 1/2] Update redis to new version with TLS support. --- docs/source/modules/installation/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/modules/installation/installation.rst b/docs/source/modules/installation/installation.rst index 2d03597f1..dabc4f807 100644 --- a/docs/source/modules/installation/installation.rst +++ b/docs/source/modules/installation/installation.rst @@ -94,7 +94,7 @@ can also be used for the celery broker. This method will be called local-redis. .. code-block:: bash # Download redis - wget http://download.redis.io/releases/redis-5.0.7.tar.gz + wget http://download.redis.io/releases/redis-6.0.5.tar.gz # Untar tar xvf redis*.tar.gz @@ -361,8 +361,8 @@ server and python. mkdir -p ${HOME}/merlinu/cert_redis cp result/* ${HOME}/merlinu/cert_redis -The ``redis:6.0-rc2`` docker service is exchanged for the previous -``redis:latest`` service. The configuration below does not use client + +The configuration below does not use client verification ``--tls-auth-clients no`` so the ssl files do not need to be defined as shown in the :ref:`broker_redis_ssl` section. From c910c1cf309a6102a69e27e2f4b293ab8249558d Mon Sep 17 00:00:00 2001 From: "Joseph M. Koning" Date: Mon, 20 Jul 2020 09:56:55 -0700 Subject: [PATCH 2/2] Add changelog. --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 720d87581..3a599e803 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,14 +15,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Flux test example data collection for new versions of flux. - Fixed Docker ubuntu version. - -### Fixed - Removed expansion of env variables in shell sections (`cmd` and `restart`) of provenance specs. This allows the shell command itself to expand environment variables, and gives users greater flexibility. - Allowed environment variables to be properly expanded in study `description.name`. - Tilde (~) now properly expands as part of a path in non-shell sections. +### Changed +- Updated tutorial redis version to 6.0.5. + ## [1.6.2] ### Added