Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ansible/ansible-examples.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Foster <wfoster@redhat.com>2016-08-30 21:54:42 +0300
committerWill Foster <wfoster@redhat.com>2016-08-30 21:54:42 +0300
commit9feee8257863d43d9caa4b5af70d065ecc71699c (patch)
treee72e55b9545e5e0ccd08875018af003d1e61ea3f
parent5bd179d1b2d2d512318b77dc20cce2ae29e3333f (diff)
Update WP version to 4.6, firewalld non-fatal
* Update WP version and sha256 checksum to 4.6 * Make firewalld rules non-fatal, iptables-services is still a valid way to manage firewall rules or firewalld may be masked.
-rw-r--r--wordpress-nginx_rhel7/group_vars/all4
-rw-r--r--wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml3
-rw-r--r--wordpress-nginx_rhel7/roles/nginx/tasks/main.yml1
3 files changed, 5 insertions, 3 deletions
diff --git a/wordpress-nginx_rhel7/group_vars/all b/wordpress-nginx_rhel7/group_vars/all
index 748ce16..a7aaf5a 100644
--- a/wordpress-nginx_rhel7/group_vars/all
+++ b/wordpress-nginx_rhel7/group_vars/all
@@ -1,7 +1,7 @@
---
# Variables listed here are applicable to all host groups
-wp_version: 4.3
-wp_sha256sum: 3b0db3abe8504f15a33cf64188a493ec0de01eaa8d20e37c3d6a1d9fa0a40fb4
+wp_version: 4.6
+wp_sha256sum: c1856cf969b1e73025ba2c681491908c3a4a6c5a2333f4531bf9bfb90f634380
# MySQL settings
mysqlservice: mysqld
diff --git a/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml b/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml
index 6b2d15c..5f930bf 100644
--- a/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml
+++ b/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml
@@ -24,4 +24,5 @@
service: name=mariadb state=started enabled=yes
- name: insert firewalld rule
- firewalld: port={{ mysql_port }}/tcp permanent=true state=enabled immediate=yes \ No newline at end of file
+ firewalld: port={{ mysql_port }}/tcp permanent=true state=enabled immediate=yes
+ ignore_errors: yes
diff --git a/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml b/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml
index 16baaf7..14fae22 100644
--- a/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml
+++ b/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml
@@ -8,6 +8,7 @@
- name: insert firewalld rule for nginx
firewalld: port={{ nginx_port }}/tcp permanent=true state=enabled immediate=yes
+ ignore_errors: yes
- name: http service state
service: name=nginx state=started enabled=yes