Skip to content

Commit cad1192

Browse files
committed
Merge pull request geerlingguy#115 from jonpugh/patch-1
Fix "when" statement for mysql error log file permissions.
2 parents 7a0a482 + c87ce1f commit cad1192

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ script:
4343
# Test role.
4444
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
4545

46+
# Test role again.
47+
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}'
48+
4649
# Test role idempotence.
4750
- >
4851
sudo docker exec "$(cat ${container_id})" ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook}

tasks/configure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
owner: mysql
5454
group: mysql
5555
mode: 0644
56-
when: mysql_slow_query_log_enabled
56+
when: mysql_log == "" and mysql_log_error != ""
5757

5858
- name: Ensure MySQL is started and enabled on boot.
5959
service: "name={{ mysql_daemon }} state=started enabled={{ mysql_enabled_on_startup }}"

0 commit comments

Comments
 (0)