From 878c943b84ff1308cb21eb4a7187e3ab2b83efe5 Mon Sep 17 00:00:00 2001 From: Florian Goth Date: Wed, 3 Jan 2024 16:03:05 +0100 Subject: [PATCH] try the first actual redis test --- molecule/default/converge.yml | 37 +---------------------------------- tasks/main.yml | 4 ---- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 5f6bcea..832ff5f 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -8,39 +8,4 @@ ## Setup test enviroment # test whether redis server accepts connections on the unix socket - name: test connection to socket - copy: - content: | - Success! The test page is displayed correctly - dest: "{{www_dir}}/index.html" - group: "{{ nginx_user }}" - owner: "{{ nginx_group }}" - mode: 0754 - register: deployed - - name: Deploy nginx configuration - copy: - content: | - server { - listen 80 default_server; - listen [::]:80 default_server; - root {{ www_dir }}; - index index.html index.htm; - location / { - try_files $uri $uri/ =404; - } - } - dest: "{{vhosts_dir}}/default.conf" - owner: root - group: root - mode: 0644 - when: deployed.changed and deploy_nginx_config == true - - - name: Perform nginx check - shell: nginx -t - when: deployed.changed - - # Restart of nginx is required for the new configuration - - name: Restart nginx - systemd: - name: nginx - state: restarted - when: deployed.changed + shell: redis-benchmark -q -n 100 -s /var/run/redis/{{ redis_instancename }}.sock diff --git a/tasks/main.yml b/tasks/main.yml index 2c8b1a1..1faa9a8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -40,10 +40,6 @@ - -m - '0750' - "/var/lib/redis/{{ redis_instancename }}/" -# args: -# cmd: > -# "/usr/bin/install -d -o redis -g redis -m 0750 -# /var/lib/redis/{{ redis_instancename }}/" - name: Ensure Redis is running and enabled on boot. service: "name={{ redis_daemon }} state=started enabled=yes"