From e7b69ff4c5a13600b9fc1e20a93ff8fec4237bc7 Mon Sep 17 00:00:00 2001
From: Olaf Bohlen <olbohlen@eenfach.de>
Date: Tue, 25 Aug 2020 10:48:09 +0200
Subject: [PATCH] fixes and include sudo

---
 tasks/main.yml       |    9 +++++++++
 templates/sysding.j2 |    3 +++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 244a684..0d6f6d4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,6 +2,14 @@
 # tasks file for oi-zone
 - name: creating zone for you
   block:
+    # jump into rescue if we want to uninstall
+    - name: check for uninstall
+      fail:
+        msg: "uninstall is set to true, deleting resources"
+      when:
+        - oizone['uninstall'] is defined
+        - oizone['uninstall']
+        
     - name: create VNICs with VLAN
       dladm_vnic:
         name: "{{ item['logical'] }}"
@@ -30,6 +38,7 @@
         name: "{{ oizone['name'] }}"
         state: installed
         path: "{{ oizone['zoneroot'] }}/{{ oizone['name'] }}"
+        install_options: "-e pkg:/security/sudo"
         config: >
           set brand={{ oizone['brand'] }};
           set autoboot={{ oizone['autoboot'] }};
diff --git a/templates/sysding.j2 b/templates/sysding.j2
index b2416ad..17bb857 100644
--- a/templates/sysding.j2
+++ b/templates/sysding.j2
@@ -16,6 +16,9 @@
 {% endif %}
 chown -R {{ user['name'] }}:{{ user['gid'] }} {{ user['home'] }}
 {% endif %}
+{% if user['sudoers'] is defined %}
+echo "{{ user['sudoers'] }}" >/etc/sudoers.d/"{{ user['name'] }}"
+{% endif %}
 setup_user_password {{ user['name'] }} '{{ user["hashedpassword"] }}'
 {% endfor %}
 

--
Gitblit v1.9.3