fix: Fixed confis and installation

docker-compose.redis.yaml

@@ -8,7 +8,7 @@ volumes:
 services:
   redis:
     container_name: ddev-${DDEV_SITENAME}-redis
-    image: redis:${DDEV_REDIS_VERSION:-6}-alpine
+    image: redis:${DDEV_REDIS_VERSION:-6-alpine}
     command: /etc/redis/conf/redis.conf
     volumes:
       - '.:/mnt/ddev_config'

install.yaml

@@ -4,11 +4,20 @@ pre_install_actions:
 
 # list of files and directories listed that are copied into project .ddev directory
 project_files:
-  - docker-compose.redis.yaml
+  - commands/redis/redis
+  - commands/redis/redis-flush
   - redis/scripts/settings.ddev.redis.php
   - redis/scripts/setup-drupal-settings.sh
   - redis/redis.conf
-  - commands/redis/redis
+  - redis/advanced.conf
+  - redis/append.conf
+  - redis/general.conf
+  - redis/io.conf
+  - redis/memory.conf
+  - redis/network.conf
+  - redis/security.conf
+  - redis/snapshots.conf
+  - docker-compose.redis.yaml
 
 # List of files and directories that are copied into the global .ddev directory
 global_files:
@@ -17,7 +26,11 @@ post_install_actions:
   - |
     #ddev-nodisplay
     #ddev-description:Install redis settings for Drupal 9+ if applicable
-    redis/scripts/setup-drupal-settings.sh
+    bash redis/scripts/setup-drupal-settings.sh
+  - |
+    #ddev-description: Change the redis dump filename
+    #
+    sed -i "s/REPLACE_ME/${DDEV_SITENAME}/g" redis/snapshots.conf
 
 removal_actions:
   - |

redis/advanced.conf

@@ -246,7 +246,7 @@ rdb-save-incremental-fsync yes
 
 ############################## DEBUG COMMAND #############################
 
-enable-debug-command yes
+# enable-debug-command yes
 
 ########################### ACTIVE DEFRAGMENTATION #######################
 #

redis/append.conf

@@ -29,7 +29,7 @@ appendfilename "appendonly.aof"
 # directory. The name of the directory is determined by the appenddirname
 # configuration parameter.
 
-appenddirname "append"
+# appenddirname "append"
 
 # The fsync() call tells the Operating System to actually write data on disk
 # instead of waiting for more data in the output buffer. Some OS will really flush

tests/test.bats

@@ -6,7 +6,7 @@ setup() {
   set -eu -o pipefail
 
   export ADDON_DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
-  export PROJECT=testproj
+  export PROJECT=testproject
   export TEST_DIR="$HOME/tmp/$PROJECT"
   export DDEV_NON_INTERACTIVE=true
 
@@ -68,6 +68,7 @@ health_checks() {
 teardown() {
   set -eu -o pipefail
   cd "$TEST_DIR" || ( printf "unable to cd to $TEST_DIR\n" && exit 1 )
+  ddev logs -s redis
   ddev stop
   ddev delete -Oy "$PROJECT" >/dev/null 2>&1
   [ "$TEST_DIR" != "" ] && rm -rf "$TEST_DIR"