change inclusion of os specific defaults (#353)

* change inclusion of os specific defaults we now include the os specific options into a separate variable and merge this with the default ansible namespace, when the corresponding keys do not already exist (eg. are defined by default oder by user) Signed-off-by: Martin Schurz <[email protected]> * simplify check for os specific variables Signed-off-by: Martin Schurz <[email protected]> * add test for variable override Signed-off-by: Martin Schurz <[email protected]> * move tests to verify stage Signed-off-by: Martin Schurz <[email protected]> * correct grep Signed-off-by: Martin Schurz <[email protected]> * linting Signed-off-by: Martin Schurz <[email protected]> * fix typo Signed-off-by: Martin Schurz <[email protected]> * Revert "Merge pull request #351 from sprat/fix-umask" This reverts commit 9e8e0bc8fb, reversing changes made to 98c7553016. Signed-off-by: Martin Schurz <[email protected]> * move immutable ssh vars to internal vars Signed-off-by: Martin Schurz <[email protected]> * move vars to OS files Signed-off-by: Martin Schurz <[email protected]> * change default handling for all roles Signed-off-by: Martin Schurz <[email protected]> * fix issues Signed-off-by: Martin Schurz <[email protected]> * add documentation Signed-off-by: Martin Schurz <[email protected]> * Update main.yml Co-authored-by: Sebastian Gumprich <[email protected]>
2020-12-20 20:46:57 +01:00
1 parent 83e29b01f5
commit a75e2c028b
@@ -56,3 +56,17 @@
      fail:
        msg: "Inspec failed to validate"
      when: test_results.rc != 0
+
+    # test if variable can be overridden
+    - name: workaround for https://github.com/ansible/ansible/issues/66304
+      set_fact:
+        ansible_virtualization_type: "docker"
+        os_env_umask: "027 #override"
+
+    - include_role:
+        name: os_hardening
+
+    - name: verify os_env_umask
+      shell:
+        cmd: "grep '027 #override' /etc/login.defs"
+      changed_when: false