From 5b1304dc45888213878a0694f052e9d85740e18c Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 2 Nov 2015 09:17:41 +0200
Subject: [PATCH] - Rename force_ssl to force_https. - Rename variables to
start with wordpress_. - Change default value of wordpress_force_https to
False.
---
README.rst | 5 +++--
defaults/main.yml | 5 +++--
templates/wp-config.php.j2 | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/README.rst b/README.rst
index e88501d..bce6d32 100644
--- a/README.rst
+++ b/README.rst
@@ -16,8 +16,9 @@ Role Variables
::
- fqdn: ansible_fqdn #Site FQDN.
- force_ssl: True #Force SSL for site URL.
+ wordpress_fqdn: {{ ansible_fqdn }} #Site FQDN.
+ wordpress_force_https: False #Force SSL for site URL.
+ wordpress_mysql_server: #Address for the MySQL server.
Dependencies
------------
diff --git a/defaults/main.yml b/defaults/main.yml
index 0ffee86..fb9a446 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,6 @@
---
# defaults file for wordpress
-fqdn: '{{ ansible_fqdn }}'
-force_ssl: True
+wordpress_fqdn: '{{ ansible_fqdn }}'
+wordpress_force_https: False
+wordpress_mysql_server: localhost
diff --git a/templates/wp-config.php.j2 b/templates/wp-config.php.j2
index aa04290..cc85ba4 100644
--- a/templates/wp-config.php.j2
+++ b/templates/wp-config.php.j2
@@ -55,9 +55,9 @@ define('SECURE_AUTH_SALT', 'put your unique phrase here');
define('LOGGED_IN_SALT', 'put your unique phrase here');
define('NONCE_SALT', 'put your unique phrase here');
define('FS_METHOD', 'direct');
-define('WP_HOME', '{{ fqdn }}');
-define('WP_SITEURL', '{{ fqdn }}');
-{% if force_ssl %}
+define('WP_HOME', '{{ wordpress_fqdn }}');
+define('WP_SITEURL', '{{ wordpress_fqdn }}');
+{% if wordpress_force_https|default(False) %}
$_SERVER['HTTPS']='on';
{% endif %}
--
GitLab