Merge pull request #3 from ItinerisLtd/radicle-support

radicle-support

README.md

@@ -53,18 +53,18 @@ ansible-galaxy install -r galaxy.yml --force
     ```yaml
     # group_vars/all/deploy-hooks.yml
     # Learn more on https://roots.io/trellis/docs/deploys/#hooks
-    deploy_after:
+    deploy_finalize_after:
       - "{{ playbook_dir }}/vendor/roles/itinerisltd.trellis-wordfence-kinsta/tasks/main.yml"
     ```
 
 ## Usage
 
 1. Setup the [role variables](#role-variables)
 2. [Deploy](https://roots.io/trellis/docs/deploys/#example)
-3. Tell Kinsta to add the `auto_prepend_file` variable that points to `{{ deploy_helper.current_path }}/web/wp/wordfence-waf.php`
+3. Tell Kinsta to add the `auto_prepend_file` variable that points to `{{ deploy_helper.current_path }}/config/wordfence-waf.php`
     1. `deploy_helper.shared_path` can differ between Trellis setups. Check for final path before asking Kinsta.
-    2. This is usually where the uploads are stored.
-    3. E.g. `auto_prepend_file = '/www/kinstauser_123/public/current/web/wp/wordfence-waf.php'`
+    2. This is the path to the Bedrock/Radicle configs.
+    3. E.g. `auto_prepend_file = '/www/kinstauser_123/public/current/config/wordfence-waf.php'`
 
 ## FAQs
 

tasks/main.yml

@@ -2,5 +2,8 @@
 - name: Template wordfence-waf.php
   ansible.builtin.template:
     src: "../templates/wordfence-waf.php.j2"
-    dest: "{{ deploy_helper.new_release_path }}/web/wp/wordfence-waf.php"
+    dest: "{{ deploy_helper.new_release_path }}/config/wordfence-waf.php"
     mode: "0755"
+  with_dict: "{{ wordpress_sites }}"
+  vars:
+    project_plugins_path: "{{ project.plugins_path | default('app/plugins') }}"

templates/wordfence-waf.php.j2

@@ -1,7 +1,8 @@
 <?php
 // Before removing this file, please verify the PHP ini setting `auto_prepend_file` does not point to this.
-
-if (file_exists('{{ deploy_helper.new_release_path }}/web/app/plugins/wordfence/waf/bootstrap.php')) {
-	define('WFWAF_LOG_PATH', '{{ deploy_helper.new_release_path }}/../../wflogs/');
-	include_once '{{ deploy_helper.new_release_path }}/web/app/plugins/wordfence/waf/bootstrap.php';
+if (file_exists('{{ deploy_helper.new_release_path }}/{{ project_public_path }}/{{ project_plugins_path }}/wordfence/waf/bootstrap.php')) {
+	if (! defined('WFWAF_LOG_PATH')) {
+		define('WFWAF_LOG_PATH', '{{ deploy_helper.new_release_path }}/../../wflogs/');
+	}
+	include_once '{{ deploy_helper.new_release_path }}/{{ project_public_path }}/{{ project_plugins_path }}/wordfence/waf/bootstrap.php';
 }