Move debops.nginx role dependencies to playbook level after drop in v0.2

carlalexander · Apr 17, 2017 · 34a8971 · 34a8971
1 parent e412484
commit 34a8971
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -28,6 +28,8 @@ v0.4.0
   ``wordpress__nginx__csp_report`` has been dropped. You can use
   ``nginx__http_csp_append`` to set a custom ``report-uri`` for all policies. [ypid_]
 
+- Update role dependencies of the wordpress role to work with debops.nginx v0.2.0 and above. [ypid_]
+
 
 v0.3.1
 ------

diff --git a/roles/wordpress/meta/main.yml b/roles/wordpress/meta/main.yml
@@ -14,6 +14,16 @@ dependencies:
     secret_directories:
         - '{{ pki_env_secret_directories }}'
 
+  - role: debops.apt_preferences
+    tags: [ 'role::apt_preferences' ]
+    apt_preferences__dependent_list:
+      - '{{ nginx__apt_preferences__dependent_list }}'
+
+  - role: debops.ferm
+    tags: [ 'role::ferm' ]
+    ferm__dependent_rules:
+      - '{{ nginx__ferm__dependent_rules }}'
+
   - role: debops.users
     tags: [ 'depend::users', 'depend::users:wordpress', 'depend-of::wordpress', 'type::dependency:hard' ]
     users__accounts: '{{ wordpress__users__accounts }}'
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ v0.4.0 @@
       ``wordpress__nginx__csp_report`` has been dropped. You can use
       ``nginx__http_csp_append`` to set a custom ``report-uri`` for all policies. [ypid_]
+    - Update role dependencies of the wordpress role to work with debops.nginx v0.2.0 and above. [ypid_]
     v0.3.1
     ------
@@ Expand Down @@