From 6250430b6882ad5fdd6c11fa8fc6da222928877d Mon Sep 17 00:00:00 2001
From: Cian Hatton <cianhatton@gmail.com>
Date: Thu, 4 Aug 2022 10:46:38 +0100
Subject: [PATCH] adding additional checks to mount-hdds

---
 ansible/homelab/playbooks/mount-hdds.yml      | 44 ++++++++++++++++++-
 .../tasks/install-dev-tooling-tasks.yml       |  3 ++
 .../homelab/tasks/install-docker-tasks.yml    |  7 +--
 ansible/homelab/variables.yml                 |  1 +
 cmd/portainer/portainer.go                    |  4 ++
 cmd/root.go                                   |  2 +-
 6 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/ansible/homelab/playbooks/mount-hdds.yml b/ansible/homelab/playbooks/mount-hdds.yml
index c9236b2..2b28707 100644
--- a/ansible/homelab/playbooks/mount-hdds.yml
+++ b/ansible/homelab/playbooks/mount-hdds.yml
@@ -4,10 +4,50 @@
     - ../variables.yml
   become: true
   tasks:
-  - name: Mount up device by UUID
+  - name: Ensure /mnt/hdds directory
+    file:
+      path: /mnt/hdds
+      state: directory
+
+  - name: Unmount HDDS
+    ansible.posix.mount:
+      path: /mnt/hdds
+      src: "UUID={{hdds_uuid}}"
+      fstype: ext4
+      state: unmounted
+      opts: default,nofail
+
+  - name: Make /mnt/hdds immutable
+    ansible.builtin.shell:  chattr +i /mnt/hdds
+
+  - name: Mount HDDS
     ansible.posix.mount:
       path: /mnt/hdds
       src: "UUID={{hdds_uuid}}"
       fstype: ext4
       state: mounted
-      opts: default,nofail
\ No newline at end of file
+      opts: default,nofail
+
+  - name: Ensure /mnt/ssd0 directory
+    file:
+      path: /mnt/ssd0
+      state: directory
+
+  - name: Unmount SSD0
+    ansible.posix.mount:
+      path: /mnt/ssd0/
+      src: "UUID={{ssd0_uuid}}"
+      fstype: ext4
+      state: unmounted
+      opts: default,nofail
+
+  - name: Make /mnt/ssd0 immutable
+    ansible.builtin.shell:  chattr +i /mnt/ssd0
+
+  - name: Mount SSD0
+    ansible.posix.mount:
+      path: /mnt/ssd0/
+      src: "UUID={{ssd0_uuid}}"
+      fstype: ext4
+      state: mounted
+      opts: default,nofail
diff --git a/ansible/homelab/tasks/install-dev-tooling-tasks.yml b/ansible/homelab/tasks/install-dev-tooling-tasks.yml
index 58a2c7d..6c94d8c 100644
--- a/ansible/homelab/tasks/install-dev-tooling-tasks.yml
+++ b/ansible/homelab/tasks/install-dev-tooling-tasks.yml
@@ -6,3 +6,6 @@
     - fzf
     - git
     - mdadm
+    - parted
+    - ncdu
+    - tree
diff --git a/ansible/homelab/tasks/install-docker-tasks.yml b/ansible/homelab/tasks/install-docker-tasks.yml
index 561fb84..9df5f22 100644
--- a/ansible/homelab/tasks/install-docker-tasks.yml
+++ b/ansible/homelab/tasks/install-docker-tasks.yml
@@ -42,9 +42,6 @@
     dest: /usr/local/bin/docker-compose
     mode: 'u+x,g+x'
 
-#- name: Stop Docker Service
-#  ansible.builtin.shell: sudo service docker stop
-
 # Change the docker dir.
 - name: Stop docker service
   ansible.builtin.service:
@@ -52,6 +49,7 @@
     state: stopped
 
 - name: Change volume path
+  tags: "skip-e2e"
   copy:
     dest: "/etc/docker/daemon.json"
     content: |
@@ -60,14 +58,17 @@
       }
 
 - name: Backup old files
+  tags: "skip-e2e"
   ansible.builtin.shell: cp -r /var/lib/docker /var/lib/docker.bak
 
 - name: Delete old docker directory
+  tags: "skip-e2e"
   file:
     state: absent
     path: /var/lib/docker
 
 - name: Start docker service
+  tags: "skip-e2e"
   ansible.builtin.service:
     name: docker
     state: started
diff --git a/ansible/homelab/variables.yml b/ansible/homelab/variables.yml
index 2c46163..d91301a 100644
--- a/ansible/homelab/variables.yml
+++ b/ansible/homelab/variables.yml
@@ -5,4 +5,5 @@ backup_dir: /mnt/hdds/backups/
 docker_volume_backup_image: ghcr.io/chatton/docker-volume-backup:master
 home_lab_checkout_dir: /home/cianhatton/checkouts/HomeLab
 hdds_uuid: 8d6e8b33-7d7f-456b-9976-7baea0cf4260
+ssd0_uuid: daa00585-fa38-424c-84e7-844223362ae4
 docker_daemon_host_path: /mnt/ssds/docker
diff --git a/cmd/portainer/portainer.go b/cmd/portainer/portainer.go
index 9da95ce..2967710 100644
--- a/cmd/portainer/portainer.go
+++ b/cmd/portainer/portainer.go
@@ -19,3 +19,7 @@ var NumbersCmd = &cobra.Command{
 		fmt.Println("--range:", rangeFlagNumbers)
 	},
 }
+
+func NewPortainerCommand() *cobra.Command {
+	return nil
+}
diff --git a/cmd/root.go b/cmd/root.go
index 294f4fe..6d796fe 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -9,7 +9,7 @@ import (
 )
 
 func init() {
-	rootCmd.AddCommand(portainer.NumbersCmd)
+	rootCmd.AddCommand(portainer.NewPortainerCommand())
 }
 
 var rootCmd = &cobra.Command{