From b362bfef17f34fecdf93f3e8d62aa398591a8555 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 25 Nov 2022 01:08:00 +0100
Subject: [PATCH] update..

---
 group_vars/akb.yml                           |  2 ++
 group_vars/all/main.yml                      |  3 +++
 group_vars/flr.yml                           | 11 +++++++++++
 group_vars/mbr.yml                           |  2 ++
 group_vars/sprachenatelier.yml               |  2 ++
 roles/common/templates/etc/samba/smb.conf.j2 |  2 +-
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/group_vars/akb.yml b/group_vars/akb.yml
index 65a9b54..129a878 100644
--- a/group_vars/akb.yml
+++ b/group_vars/akb.yml
@@ -330,6 +330,8 @@ nis_user:
 # ==========
 
 samba_server: file-akb.akb.netz
+samba_server_ip: 192.168.82.10
+samba_server_cidr_prefix: 24
 
 
 # ==========
diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index b9048e6..2d7770f 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -1156,6 +1156,9 @@ nis_user: []
 # vars used by roles/common/tasks/mount_samba_shares.yml
 # ==========
 
+samba_server_ip:
+samba_server_cidr_prefix: 24
+
 apt_install_server_samba:
   - samba
   - nscd
diff --git a/group_vars/flr.yml b/group_vars/flr.yml
index 4f9225b..25c6b5d 100644
--- a/group_vars/flr.yml
+++ b/group_vars/flr.yml
@@ -238,8 +238,16 @@ nis_user:
     is_samba_user: true
     password: '20_pierre16!20'
 
+  - name: rola
+    groups:
+      - amif
+      - team
+    is_samba_user: true
+    password: '20-ro-la%22!'
+
   - name: vincent
     groups:
+      - amif
       - team
       - esf-bleibnet
     is_samba_user: true
@@ -253,6 +261,8 @@ nis_user:
 # ==========
 
 samba_server: file-flr.flr.netz
+samba_server_ip: 192.168.102.10
+samba_server_cidr_prefix: 24
 
 
 # ==========
@@ -332,6 +342,7 @@ samba_shares:
       - kamue
       - lotta
       - mara
+      - vincent
 
   - name: Quali
     path: /data/samba/Quali
diff --git a/group_vars/mbr.yml b/group_vars/mbr.yml
index e9d8846..6842ac2 100644
--- a/group_vars/mbr.yml
+++ b/group_vars/mbr.yml
@@ -763,6 +763,8 @@ nis_user:
 # ==========
 
 samba_server: file-mbr.mbr-bln.netz
+samba_server_ip: 192.168.112.10
+samba_server_cidr_prefix: 24
 
 
 # ==========
diff --git a/group_vars/sprachenatelier.yml b/group_vars/sprachenatelier.yml
index e8bbf6b..adef597 100644
--- a/group_vars/sprachenatelier.yml
+++ b/group_vars/sprachenatelier.yml
@@ -403,6 +403,8 @@ nis_user:
 # ==========
 
 samba_server: file-spr.sprachenatelier.netz
+samba_server_ip: 192.168.92.10
+samba_server_cidr_prefix: 24
 
 
 # ==========
diff --git a/roles/common/templates/etc/samba/smb.conf.j2 b/roles/common/templates/etc/samba/smb.conf.j2
index 91ae402..d28c666 100644
--- a/roles/common/templates/etc/samba/smb.conf.j2
+++ b/roles/common/templates/etc/samba/smb.conf.j2
@@ -67,7 +67,7 @@
 # This can be either the interface name or an IP address/netmask;
 # interface names are normally preferred
 ;   interfaces = 127.0.0.0/8 eth0
-   interfaces =  {{ ansible_default_ipv4.address }}/24  127.0.0.1/8
+   interfaces =   {{ samba_server_ip }}/{{ samba_server_cidr_prefix }} 127.0.0.1/8
 
 # Option 'hosts deny' and 'hosts allow' added to debian's default smb.conf 
    hosts deny = 0.0.0.0/0