Revert back to using separate logging roles, include bash-logging 1.0.3

provisioning/playbook.yml

@@ -42,7 +42,7 @@
   roles:
       - chrony
 
-- name: setup logging
+- name: setup logging bash
   hosts:
     - attacker
     - web
@@ -51,11 +51,22 @@
   become: yes
   become_user: root
   vars:
+    student_id: 0
+    sandbox_name: kobylka-3302-local
     central_syslog_ip: 78.128.251.179
-    sandbox_name: locust-3302-local
   roles:
-    - role: sandbox-logging
+    - role: sandbox-logging-forward
       slf_destination: '{% if hostvars["man"] is defined -%} {{ hostvars["man"].ansible_host }} {%- else -%} {{ central_syslog_ip }} {%- endif %}'
-      slf_sandbox_id: "{{ kypo_global_sandbox_allocation_unit_id | default(student_id) | default(0) }}"
+      slf_sandbox_id: "{{ kypo_global_sandbox_allocation_unit_id | default(student_id) }}"
       slf_sandbox_name: '{{ kypo_global_sandbox_name | default(sandbox_name) }}'
-      become: yes
+      slf_pool_id: '{{ kypo_global_pool_id | default(None) }}'
+    - role: sandbox-logging-bash
+
+- name: setup logging msf
+  hosts:
+    - attacker
+  gather_facts: yes
+  become: yes
+  become_user: root
+  roles:
+    - role: sandbox-logging-msf

provisioning/requirements.yml

-- name: sandbox-logging
-  src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/sandbox-logging.git
+- name: sandbox-logging-bash
+  src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/sandbox-logging-bash.git
   scm: git
-  version: 1.0.0
+  version: 1.0.3
+
+- name: sandbox-logging-msf
+  src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/sandbox-logging-msf.git
+  scm: git
+  version: 1.0.1
+
+- name: sandbox-logging-forward
+  src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/sandbox-logging-forward.git
+  scm: git
+  version: 1.0.1
 
 - name: chrony
   src: https://gitlab.ics.muni.cz/muni-kypo/ansible-roles/chrony.git