3 files changed, 20 insertions, 95 deletions
diff --git a/roles/elevate/media/tasks/main.yml b/roles/elevate/media/tasks/main.yml
index 89bf2038..448d3537 100644
--- a/roles/elevate/media/tasks/main.yml
+++ b/roles/elevate/media/tasks/main.yml
@@ -1,36 +1,18 @@
 ---
-- name: install packages
+- name: install samba
   apt:
     name:
-      - mdadm
-      - nginx
-      - systemd-docker
-      - "{{ python_basename }}-openssl"
-      - samba
-      - saswall
+    - samba
     state: present
 
-- name: configure network
-  import_tasks: network.yml
-
 - name: configure samba
   import_tasks: samba.yml
 
-- name: install and configure nextcloud
-  import_tasks: nextcloud.yml
-
-- name: configure nginx vhost
-  import_role:
-    name: nginx/vhost
-  vars:
-    nginx_vhost:
-      name: nextcloud
-      content: "{{ lookup('template', 'nextcloud-nginx.conf.j2') }}"
-      acme: true
-      hostnames: "{{ nextcloud_hostnames }}"
+# - name: install and configure nextcloud
+#   import_tasks: nextcloud.yml
 
-- name: install dstat script
-  template:
-    src: dstat.sh.j2
-    dest: /usr/local/bin/dstat.sh
-    mode: 0755
+# - name: install dstat script
+#   template:
+#     src: dstat.sh.j2
+#     dest: /usr/local/bin/dstat.sh
+#     mode: 0755
diff --git a/roles/elevate/media/tasks/network.yml b/roles/elevate/media/tasks/network.yml
deleted file mode 100644
index ef6d364a..00000000
--- a/roles/elevate/media/tasks/network.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- name: create netplan conf-available directory
-  file:
-    path: /etc/netplan/conf-available
-    state: directory
-
-- name: install netplan configs
-  loop:
-  - lan-only
-  - r3
-  - r3-with-lan
-  - elevate-festival
-  - elevate-office
-  template:
-    src: "netplan/{{ item }}.yaml.j2"
-    dest: "/etc/netplan/conf-available/{{ item }}.yaml"
-  notify: netplan apply
-
-- name: install firewall scripts
-  loop:
-  - lan-only
-  - r3
-  - r3-with-lan
-  - elevate-festival
-  - elevate-office
-  template:
-    src: "firewall/{{ item }}.sh.j2"
-    dest: "/etc/saswall/{{ item }}.sh"
-    mode: 0755
-  notify: firewall restart
-
-- name: remove default netplan config
-  file:
-    path: /etc/netplan/01-netcfg.yaml
-    state: absent
-  notify: netplan apply
-
-- name: set active netwok setup
-  loop:
-  - dest: /etc/netplan/01-active.yaml
-    src: "conf-available/{{ network_setup }}.yaml"
-  - dest: /etc/saswall/rules.sh
-    src: "{{ network_setup }}.sh"
-  file:
-    state: link
-    dest: "{{ item.dest }}"
-    src: "{{ item.src }}"
-  notify:
-  - netplan apply
-  - firewall restart
-
-- name: make sure network config has been applied
-  meta: flush_handlers
diff --git a/roles/elevate/media/tasks/samba.yml b/roles/elevate/media/tasks/samba.yml
index 65cc1d1b..3101a82a 100644
--- a/roles/elevate/media/tasks/samba.yml
+++ b/roles/elevate/media/tasks/samba.yml
@@ -2,35 +2,31 @@
 - name: create group for shared access
   group:
     name: share
-    gid: "{{ share_gid }}"
+    gid: "{{ elevate_media_share_gid }}"
 
 - name: create guest user for samba
   user:
     name: share
-    uid: "{{ share_uid }}"
+    uid: "{{ elevate_media_share_uid }}"
     home: /var/lib/share
     group: share
     shell: /bin/false
 
-## TODO: create software raid + lvm -> mount to /srv/smbdata
+- name: prepare storage volume for samba share
+  vars:
+    storage_volume: "{{ elevate_media_share_storage | combine({'dest': '/srv/_samba_/share', 'mode': '02775', 'owner': 'root', 'group': 'share'}) }}"
+  include_role:
+    name: "storage/{{ elevate_media_share_storage.type }}/volume"
 
-- name: create directory for shared data
+- name: create directory for read-only nextcloud file bind-mounts
   file:
     state: directory
-    path: /srv/smbdata/share
-    owner: root
-    group: share
-    mode: 02775
-
-- name: create directory for read-only nextcloud files
-  file:
-    state: directory
-    path: /srv/smbdata/nextcloud
+    path: /srv/_samba_/nextcloud
 
 - name: install samba config
   template:
     src: smb.conf.j2
     dest: /etc/samba/smb.conf
   notify:
-    - restart nmbd
-    - restart smbd
+  - restart nmbd
+  - restart smbd