From 219d672e319c5ed95b2c6583608ebc5b968e1cbd Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sat, 6 Jul 2019 16:09:49 +0200
Subject: [PATCH] Minor changes on git repositiry install.

---
 group_vars/all/main.yml    | 33 +++++++++++++++++++++++----------
 roles/common/tasks/git.yml | 37 +++++++++++++++++++++++++++++++++++--
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 365bdd0..44cf6dc 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -15,6 +15,8 @@ apt_ansible_dependencies:
   - dbus
   - sudo
   - vim
+  - net-tools
+  - vlan
 
 
 # ---
@@ -639,6 +641,26 @@ git_default_repositories:
     repo: https://git.oopen.de/install/mailsystem
     dest: /usr/local/src/mailsystem
 
+# ---
+# group [oopen_server]
+# ---
+git_oopen_server_repositories:
+
+  # firewall
+  - name: ipt-server
+    repo: https://git.oopen.de/firewall/ipt-server
+    dest: /usr/local/src/ipt-server
+
+# ---
+# group [warenform_server]
+# ---
+git_warenform_server_repositories:
+
+  # firewall
+  - name: ipt-server
+    repo: https://git.oopen.de/firewall/ipt-server
+    dest: /usr/local/src/ipt-server
+
 # ---
 # group [lxc_host]
 # ---
@@ -654,11 +676,6 @@ git_lxc_host_repositories:
     repo: https://git.oopen.de/script/LXC
     dest: /root/bin/LXC
 
-  # firewall
-  - name: ipt-server
-    repo: https://git.oopen.de/firewall/ipt-server
-    dest: /usr/local/src/ipt-server
-
 # ---
 # group [lxc_guest]
 # ---
@@ -669,14 +686,10 @@ git_lxc_guest_repositories:
     repo: https://git.codecoop.org/so36intern/dehydrated-cron.git
     dest: /usr/local/src/dehydrated-cron
 
-  # firewall
-  - name: ipt-server
-    repo: https://git.oopen.de/firewall/ipt-server
-    dest: /usr/local/src/ipt-server
-
 # ---
 # group [gateway_server]
 # ---
+
 git_gateway_repositories:
 
   # firewall
diff --git a/roles/common/tasks/git.yml b/roles/common/tasks/git.yml
index 5ad9e21..db6a45b 100644
--- a/roles/common/tasks/git.yml
+++ b/roles/common/tasks/git.yml
@@ -30,9 +30,10 @@
 
 - name: (git.yml) Install/Update firewall repository
   git:
-    repo: "{{  git_firewall_repository.repo}}"
+    repo: "{{  git_firewall_repository.repo }}"
     dest: "{{  git_firewall_repository.dest }}"
-  when: git_firewall_repository is defined and git_firewall_repository > 0
+    #when: git_firewall_repository is defined and git_firewall_repository > 0
+  when: git_firewall_repository|bool
   tags:
     - git-firewall-repository
 
@@ -51,6 +52,38 @@
     - git-default-repositories
 
 
+# ---
+#  Group [oopen_server] reposotories
+# ---
+
+- name: (git.yml) Install/Update oopen_server repositories
+  git:
+    repo: '{{ item.repo }}'
+    dest: '{{ item.dest }}'
+  with_items: '{{ git_oopen_server_repositories }}'
+  loop_control:
+    label: "{{ item.name }}"
+  when: "groups['oopen_server']|string is search(inventory_hostname)"
+  tags:
+    - git-oopen-server-repositories
+
+
+# ---
+#  Group [warenform_server] reposotories
+# ---
+
+- name: (git.yml) Install/Update warenform_server repositories
+  git:
+    repo: '{{ item.repo }}'
+    dest: '{{ item.dest }}'
+  with_items: '{{ git_warenform_server_repositories }}'
+  loop_control:
+    label: "{{ item.name }}"
+  when: "groups['warenform_server']|string is search(inventory_hostname)"
+  tags:
+    - git-warenform-server-repositories
+
+
 # ---
 #  Group [lxc_guest] reposotories
 # ---