Merge branch 'ypid-rework-2'

CHANGES.rst

@@ -1,21 +1,40 @@
 Changelog
 =========
 
-v0.2.0
-------
+.. include:: includes/all.rst
 
-*Unreleased*
+**debops.samba**
 
-- Add Changelog. [ypid]
+This project adheres to `Semantic Versioning <http://semver.org/spec/v2.0.0.html>`__
+and `human-readable changelog <http://keepachangelog.com/>`_.
 
-- Added support to only configure :file:`/etc/samba/smb.conf` without
-  installing the Samba daemon. [ypid]
+The current role maintainer_ is drybjed_.
 
-- Converted :file:`defaults/main.yml` to new documentation format and improved
-  documentation. [ypid]
+
+debops.samba v0.1.0 - unreleased
+--------------------------------
+
+Added
+~~~~~
+
+- First release. [drybjed_]
+
+- Changelog. [ypid_]
+
+- Support to configure :file:`/etc/samba/smb.conf` without
+  installing the Samba daemon. [ypid_]
 
 - Put kernel modules loaded by this role to a separate file under
-  :file:`/etc/modules-load.d` managed by this role. [ypid]
+  :file:`/etc/modules-load.d` managed by this role. [ypid_]
+
+- Allow to change "name resolve order" in the global section using
+  :envvar:`samba__name_resolve_order`. [ypid_]
+
+Changed
+~~~~~~~
+
+- Converted :file:`defaults/main.yml` to new documentation format and improved
+  documentation. [ypid_]
 
 - Changed variable namespace from ``samba_`` to ``samba__``.
   ``samba_[^_]`` variables are hereby deprecated.
@@ -27,12 +46,4 @@ v0.2.0
 
      git ls-files -z | xargs --null -I '{}' find '{}' -type f -print0 | xargs --null sed --in-place --regexp-extended 's/\<(samba)_([^_])/\1__\2/g;'
 
-  [ypid]
-
-v0.1.0
-------
-
-*Unreleased*
-
-- First release. [drybjed]
-
+  [ypid_]

defaults/main.yml

@@ -16,7 +16,7 @@
 # List of base packages to install.
 # In case you only want to prepare the host for being a Samba client, remove
 # the ``samba`` package from the list. This might be required because
-# applications like ownCloud depend on the ``smbclient`` which gets things like
+# applications like ownCloud depend on the :command:`smbclient` which gets things like
 # workgroup from the file :file:`/etc/samba/smb.conf`.
 samba__base_packages:
   - 'samba'
@@ -103,6 +103,12 @@ samba__server_string: '%h file server'
 samba__service_name: 'samba'
 
 
+# .. envvar:: samba__name_resolve_order
+#
+# Resolve order of Samba.
+samba__name_resolve_order: 'lmhosts host wins bcast'
+
+
 # .. envvar:: samba__path
 #
 # Base directory of home directories and shares.
@@ -151,7 +157,7 @@ samba__default_global:
   deadtime: '10'
   wins_support: 'no'
   dns_proxy: 'no'
-  name_resolve_order: 'lmhosts host wins bcast'
+  name_resolve_order: '{{ samba__name_resolve_order }}'
 
   # Disable printing by default.
   printing: 'bsd'

handlers/main.yml

@@ -9,4 +9,3 @@
     name: '{{ samba__service_name }}'
     state: 'reloaded'
   when: ('samba' in samba__base_packages)
-

tasks/main.yml

@@ -1,4 +1,5 @@
 ---
+# .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
 - name: Install Samba packages
   apt:
@@ -19,6 +20,7 @@
     - '{{ samba__path }}'
     - '{{ samba__homes_path }}'
     - '{{ samba__shares_path }}'
+  when: ('samba' in samba__base_packages)
 
 - name: Setup samba-homedir.sh script
   template:
@@ -36,9 +38,9 @@
     owner: 'root'
     group: 'root'
     mode: '0644'
-  notify: [ 'Check config samba' ]
+  notify: [ 'Check samba config' ]
 
-# .. Kernel modules (((
+# Kernel modules [[[
 
 - name: Load kernel module specified by samba__kernel_modules
   modprobe:
@@ -63,5 +65,4 @@
     dest: '/etc/modules'
     regexp: '^nf_conntrack_netbios_ns'
     state: 'absent'
-
-# .. )))
+                                                                   # ]]]