cleanups for meridia and dibella

Vagrantfile

@@ -36,24 +36,6 @@ Vagrant.configure("2") do |config|
     debian.vm.network "forwarded_port", guest: 22, host: 3024
   end
 
-  # config.vm.define "meridia" do |arch|
-  #   arch.vm.box = "generic/arch"
-  #   arch.vm.hostname = "test-meridia"
-  #   arch.vm.network "private_network", type: "dhcp"
-  #   arch.vm.network "forwarded_port", guest: 22, host: 3025
-  #   arch.vm.provision "shell", inline: <<-SHELL
-  #     pacman -Sy --noconfirm python
-  #   SHELL
-  # end
-  # config.vm.define "dibella" do |arch|
-  #   arch.vm.box = "generic/arch"
-  #   arch.vm.hostname = "test-dibella"
-  #   arch.vm.network "private_network", type: "dhcp"
-  #   arch.vm.network "forwarded_port", guest: 22, host: 3026
-  #   arch.vm.provision "shell", inline: <<-SHELL
-  #     pacman -Sy --noconfirm python
-  #   SHELL
-  # end
   # config.vm.define "azura" do |arch|
   #   arch.vm.box = "generic/arch"
   #   arch.vm.hostname = "test-azura"

group_vars/cloud.yml

@@ -1,9 +0,0 @@
-users:
-  - mark
-  - martijn
-  - jp
-  - lourens
-  - guus
-# The cloud hosts have no nerevar user;
-ansible_user: mark
-backup_dump_dir: /var/backups/aurbis

inventory.test.yml

@@ -33,16 +33,6 @@ x86:
       ansible_host: 127.0.0.1
       ansible_port: 3029
       ansible_user: nerevar
-    # meridia:
-    #   ansible_host: 127.0.0.1
-    #   ansible_port: 3025
-    #   ansible_user: vagrant
-    #   ansible_ssh_private_key_file: .vagrant/machines/meridia/libvirt/private_key
-    # dibella:
-    #   ansible_host: 127.0.0.1
-    #   ansible_port: 3026
-    #   ansible_user: vagrant
-    #   ansible_ssh_private_key_file: .vagrant/machines/dibella/libvirt/private_key
 
 debian:
   hosts:
@@ -54,8 +44,6 @@ debian:
 #   hosts:
 #     azura:
 #     kynareth:
-#     meridia:
-#     dibella:
 home:
   hosts:
     # azura:
@@ -63,9 +51,12 @@ home:
     # kynareth:
     nocturnal:
     talos:
-# cloud:
-#   hosts:
-#     meridia:
-#     dibella:
 cloud:
   hosts:
+    akatosh:
+backup_sources:
+  hosts:
+    akatosh:
+backup:
+  hosts:
+    talos:

inventory.yml

@@ -12,10 +12,6 @@ x86:
   hosts:
     talos:
       ansible_host: 192.168.178.64
-    meridia:
-      ansible_host: 62.171.176.43
-    dibella:
-      ansible_host: 45.88.188.77
     akatosh:
       ansible_host: 169.58.40.23
 debian:
@@ -28,8 +24,6 @@ arch:
   hosts:
     azura:
     kynareth:
-    meridia:
-    dibella:
 home:
   hosts:
     azura:
@@ -39,14 +33,10 @@ home:
     talos:
 cloud:
   hosts:
-    meridia:
+    akatosh:
-    dibella:
 # Hosts whose application data talos pulls into hardlinked snapshots.
-# TODO: kill meridia/dibella
 backup_sources:
   hosts:
-    meridia:
-    dibella:
     akatosh:
 backup:
   hosts:

playbook.yml

@@ -1,12 +1,12 @@
 - name: Preprovisioning
-  hosts: all:!cloud
+  hosts: all
   become: true
   tasks:
     - import_tasks: tasks/preprovision.yml
   handlers:
     - import_tasks: handlers/main.yml
 - name: Provision all hosts
-  hosts: all:!cloud
+  hosts: all
   become: true
   remote_user: nerevar
   tasks:
@@ -47,7 +47,7 @@
     - name: Update
       include_tasks: tasks/update_debian.yml
 - name: Update Arch hosts
-  hosts: arch:!cloud
+  hosts: arch
   become: true
   remote_user: nerevar
   tasks:
@@ -60,7 +60,7 @@
     - name: Update
       include_tasks: tasks/install_docker_debian.yml
 - name: Add utility scripts
-  hosts: all:!cloud
+  hosts: all
   become: true
   remote_user: nerevar
   tasks:
@@ -79,7 +79,7 @@
   tasks:
     - import_tasks: tasks/zsh.yml
 - name: Install tmux
-  hosts: all:!cloud
+  hosts: all
   become: true
   remote_user: nerevar
   tasks:
@@ -106,15 +106,7 @@
   tags:
     - leaf
     - backup
-- name: Backup sources (cloud hosts)
+- name: Akatosh install
-  hosts: cloud
-  become: true
-  tasks:
-    - import_tasks: tasks/backup_source.yml
-  tags:
-    - leaf
-    - backup
-- name: Akatosh install (replacement cloud server)
   hosts: akatosh
   become: true
   remote_user: nerevar

tasks/jellyfin/docker-compose.yml.j2

@@ -14,6 +14,10 @@ services:
         source: /mnt/azura
         target: /media
         read_only: true
+      - type: bind
+        source: ./local
+        target: /media2
+        read_only: true
     devices:
       - /dev/dri:/dev/dri
     restart: 'unless-stopped'

tasks/nextcloud/docker-compose.yml.j2

@@ -46,6 +46,7 @@ services:
     volumes:
       - html:/var/www/html
       - /var/nextcloud:/var/nextcloud
+      - /opt/nightingale/songs:/karaoke
 
 volumes:
   db: