From 8597b0ce8a2cb248e9a7b5ab43a71e84700e192d Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sat, 23 Jan 2021 01:54:24 +0100
Subject: [PATCH] update..

---
 roles/common/tasks/samba-install.yml          | 24 +++++++++++--------
 .../common/tasks/ubuntu-x11vnc-1604-amd64.yml | 12 +++++-----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/roles/common/tasks/samba-install.yml b/roles/common/tasks/samba-install.yml
index 1630662..cc353ca 100644
--- a/roles/common/tasks/samba-install.yml
+++ b/roles/common/tasks/samba-install.yml
@@ -23,6 +23,8 @@
   with_items: "{{ samba_shares }}"
   loop_control:
     label: '{{ item.name }}'
+  when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
   tags:
     - samba-shares
 
@@ -89,12 +91,15 @@
   stat:
     path: /root/bin/samba/clean_samba_trash.sh
   register: clean_samba_trash_exists
+  when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
 
 - name: (samba-install.yml) Adjust configuration for script 'clean_samba_trash.sh'
   template: 
     dest: /root/bin/samba/conf/clean_samba_trash.conf
     src: root/bin/samba/conf/clean_samba_trash.conf.j2
   when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
     - clean_samba_trash_exists.stat.exists|bool
   tags:
     - samba-server
@@ -108,6 +113,9 @@
   check_mode: yes
   changed_when: false
   register: clean_samba_trash_dirs
+  when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
+
 
 - name: Creates a cron job for cleaning up samba trash dirs
   cron:
@@ -120,6 +128,7 @@
     user: "{{ samba_cronjob_trash_dirs.user | default('root') }}"
     job: "{{ samba_cronjob_trash_dirs.job }}"
   when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
     - clean_samba_trash_dirs.found
 
 
@@ -131,26 +140,20 @@
   stat:
     path: /root/bin/samba/set_permissions_samba_shares.sh
   register: set_permissions_on_samba_shares_exists
+  when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
 
 - name: (samba-install.yml) Adjust configuration for script 'set_permissions_samba_shares.sh'
   template: 
     dest: /root/bin/samba/conf/set_permissions_samba_shares.conf
     src: root/bin/samba/conf/set_permissions_samba_shares.conf.j2
   when:
+    - "groups['samba_server']|string is search(inventory_hostname)"
     - set_permissions_on_samba_shares_exists.stat.exists|bool
   tags:
     - samba-server
 
 
-- name: Check if cleaning up trash dirs is configured
-  lineinfile:
-    path: /root/bin/samba/conf/clean_samba_trash.conf
-    regexp: "^trash_dirs=*"
-    state: absent
-  check_mode: yes
-  changed_when: false
-  register: set_permissions_samba_shares
-
 - name: Creates a cron job for cleaning up samba trash dirs
   cron:
     name: '{{ samba_cronjob_permissions.name }}'
@@ -162,7 +165,8 @@
     user: "{{ samba_cronjob_permissions.user | default('root') }}"
     job: "{{ samba_cronjob_permissions.job }}"
   when:
-    - set_permissions_samba_shares.found
+    - "groups['samba_server']|string is search(inventory_hostname)"
+    - clean_samba_trash_dirs.found
 
 
 # ---
diff --git a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
index 9793984..34ee9b5 100644
--- a/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
+++ b/roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
@@ -54,10 +54,10 @@
       enabled: yes
       state: started
 
-  - name: "(ubuntu-x11vnc-1604-amd64.yml) Blocks x11vnc in GreenOS Desktop Environment for enduser "
-    file:
-      path: "/usr/share/applications/x11vnc.desktop"
-      mode: 0740
-      owner: root
-      group: administrator
+#  - name: "(ubuntu-x11vnc-1604-amd64.yml) Blocks x11vnc in GreenOS Desktop Environment for enduser "
+#    file:
+#      path: "/usr/share/applications/x11vnc.desktop"
+#      mode: 0740
+#      owner: root
+#      group: administrator