diff --git a/.circleci/config.yml b/.circleci/config.yml index 0f6ad41b..d792f16e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,7 @@ commands: cp -r script/config/examples/tls/sentinel1 ./sentinel1_tls cp -r script/config/examples/tls/sentinel2 ./sentinel2_tls cp -r script/config/examples/tls/sentinel3 ./sentinel3_tls + mkdir -m 1777 ./run - run: name: Start services command: | @@ -119,9 +120,15 @@ workflows: - test_single: requires: - install_dependencies + - test_single_unix: + requires: + - install_dependencies - test_sentinels: requires: - install_dependencies + - test_acl_unix: + requires: + - install_dependencies - test_tls: requires: - install_dependencies @@ -161,6 +168,18 @@ jobs: - start_services: services: redis-master - run_tests + test_single_unix: + executor: + name: ubuntu_vm + working_directory: ~/project + environment: + CONFIG_QUEUES_MASTER_NAME: unix://run/redis.sock + CONFIG_REDIS_PROXY: unix://run/redis.sock + steps: + - *attach-to-workspace + - start_services: + services: redis-master + - run_tests test_sentinels: executor: name: ubuntu_vm @@ -175,6 +194,22 @@ jobs: - start_services: services: redis-master redis-replica1 redis-replica2 redis-sentinel1 redis-sentinel2 redis-sentinel3 - run_tests + test_acl_unix: + executor: + name: ubuntu_vm + working_directory: ~/project + environment: + CONFIG_QUEUES_MASTER_NAME: unix://run/redis.sock + CONFIG_QUEUES_USERNAME: porta + CONFIG_QUEUES_PASSWORD: sup3rS3cre1! + CONFIG_REDIS_PROXY: unix://run/redis.sock + CONFIG_REDIS_USERNAME: porta + CONFIG_REDIS_PASSWORD: sup3rS3cre1! + steps: + - *attach-to-workspace + - start_services: + services: tls-redis-master + - run_tests test_tls: executor: name: ubuntu_vm diff --git a/script/config/examples/tls/master.conf b/script/config/examples/tls/master.conf index 0b14f10e..4661e9a8 100644 --- a/script/config/examples/tls/master.conf +++ b/script/config/examples/tls/master.conf @@ -1,4 +1,6 @@ port 0 +unixsocket /var/run/redis/redis.sock +unixsocketperm 777 tls-port 46380 tls-cert-file /etc/redis.crt tls-key-file /etc/redis.key diff --git a/script/config/podman-compose.yml b/script/config/podman-compose.yml index 96ccb0b2..3877494a 100644 --- a/script/config/podman-compose.yml +++ b/script/config/podman-compose.yml @@ -4,7 +4,9 @@ services: image: redis:6.2-alpine container_name: redis-master network_mode: host - command: [ redis-server, --port, "6379" ] + volumes: + - ./run:/var/run/redis:z + command: [ redis-server, --port, "6379", --unixsocket, "/var/run/redis/redis.sock", --unixsocketperm, "777" ] redis-replica1: image: redis:6.2-alpine @@ -47,6 +49,7 @@ services: container_name: tls-redis-master network_mode: host volumes: + - ./run:/var/run/redis:z - ./master.conf:/etc/redis.conf:z - ./circleci.crt:/etc/redis.crt:z - ./circleci.key:/etc/redis.key:z