Split packages from sshd__base_packages to allow selective changes

debops · Aug 2, 2016 · 9b3ea13 · 9b3ea13
1 parent 41802c3
commit 9b3ea13
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,13 @@ The current role maintainer_ is drybjed_.
 
 .. _debops.sshd master: https://github.com/debops/ansible-sshd/compare/v0.2.4...master
 
+Changed
+~~~~~~~
+
+- Moved some packages from :envvar:`sshd__base_packages` to
+  :envvar:`sshd__recommended_packages` and :envvar:`sshd__optional_packages` to
+  allow to overwrite them. [ypid_]
+
 
 `debops.sshd v0.2.4`_ - 2016-07-31
 ----------------------------------

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -16,9 +16,19 @@
 # .. envvar:: sshd__base_packages [[[
 #
 # List of base packages that should be installed for OpenSSH support.
-sshd__base_packages: [ 'openssh-server', 'openssh-client',
-                       'openssh-blacklist', 'openssh-blacklist-extra',
-                       'molly-guard' ]
+sshd__base_packages: [ 'openssh-server', 'openssh-client' ]
+
+                                                                   # ]]]
+# .. envvar:: sshd__recommended_packages [[[
+#
+# List of recommended packages that should be installed with OpenSSH.
+sshd__recommended_packages: [ 'openssh-blacklist', 'openssh-blacklist-extra' ]
+
+                                                                   # ]]]
+# .. envvar:: sshd__optional_packages [[[
+#
+# List of optional packages that should be installed with OpenSSH.
+sshd__optional_packages: [ 'molly-guard' ]
 
                                                                    # ]]]
 # .. envvar:: sshd__ldap_packages [[[

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -12,6 +12,8 @@
     install_recommends: False
   with_flattened:
     - '{{ sshd__base_packages }}'
+    - '{{ sshd__recommended_packages }}'
+    - '{{ sshd__optional_packages }}'
     - '{{ sshd__ldap_packages }}'
     - '{{ sshd__packages }}'