From deaf0407b86da4b2e66bc3276d646fd7cd0791cc Mon Sep 17 00:00:00 2001
From: Nick Stokoe <git.wu-lee@noodlefactory.co.uk>
Date: Wed, 3 Jan 2024 14:20:24 +0000
Subject: [PATCH] remove mopidy submodule and uses thereof

---
 .gitmodules                                   |  3 -
 snackpot.yml                                  |  6 --
 templates/docker-compose/docker-compose.yml   | 89 +------------------
 templates/docker-compose/mopidy               |  1 -
 .../docker-compose/upmpdcli/upmpdcli.conf     |  3 +-
 5 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 templates/docker-compose/mopidy

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 210697f..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "templates/docker-compose/mopidy"]
-	path = templates/docker-compose/mopidy
-	url = git@github.com:Log1x/docker-mopidy-iris.git
diff --git a/snackpot.yml b/snackpot.yml
index 173ee8a..855ee6a 100644
--- a/snackpot.yml
+++ b/snackpot.yml
@@ -33,12 +33,6 @@
       # upnp (jellyfin, minidlna and upmpdcli)
       - proto: udp
         port: "1900"
-      #  mopidy
-      - "6600"
-      - "6680"
-      - "5555"
-      # icecast
-      - "8000"
       
   tasks:
     - hostname:
diff --git a/templates/docker-compose/docker-compose.yml b/templates/docker-compose/docker-compose.yml
index dcbeb80..a174736 100644
--- a/templates/docker-compose/docker-compose.yml
+++ b/templates/docker-compose/docker-compose.yml
@@ -16,7 +16,6 @@ volumes:
   jellyfin_cache:
   minidlna_state:
   minidlna_data:
-  mopidy_data:
   navidrome_cache:
   navidrome_data:
   borgmatic-cache:
@@ -208,29 +207,8 @@ services:
       - MINIDLNA_MEDIA_DIR_2=V,/media/video
       - MINIDLNA_FRIENDLY_NAME=MiniDLNA@Snackpot
 
-#  mopidy:
-#    build: ./mopidy
-#    ports:
-#      - "6600:6600"
-#      - "6680:6680"
-#      - "8000:8000"
-#    extra_hosts:
-#      - "snackpot:host-gateway"
-#    volumes:
-#      # Makes mopidy data persistent
-#      - mopidy_data:/data
-#      # Add local music folder
-#      - minidlna_data:/music:ro
-#    networks:
-#      default:
-#    devices:
-#      - /dev/snd
-#    restart: always
-
   upmpdcli:
     build: ./upmpdcli
-#    depends_on:
-#      - mopidy
     networks:
       default:
       lan: # Static ip for the container on the macvlan net
@@ -300,70 +278,5 @@ services:
       # Test SMTP auth on the server https://doc.dovecot.org/admin_manual/debugging/debugging_authentication/
     env_file:
       - ./borgmatic.env
-      # FIXME create backup service
+
     
-
-      # Next three services adapted from
-# https://github.com/deisi/audiostation/blob/master/docker-compose.yml
-# and https://github.com/IVData/dockerfiles/blob/master/mopidy-multiroom/docker-compose.yml
-
-#   snapserver:
-#     image: ivdata/snapserver:latest
-# #    ports:
-# #        - "1704:1704"
-# #        - "1705:1705"
-# #        - "1780:1780"
-#     volumes:
-#       # The volume with the sharesound fifo for snapcast to work
-#       - fifo:/tmp/snapcast
-# #    command: "snapserver -s pipe:///tmp/sharesound/snapfifo?name=Radio"
-#     # host mode is needed for snapserver advertisement
-#     network_mode: host
-#     restart: unless-stopped
-
-#   snapclient:
-#     image: ivdata/snapclient:latest
-# #    ports:
-# #        - "1704:1704"
-# #        - "1705:1705"
-# #        - "1780:1780"
-#     devices:
-#       - /dev/snd
-#     volumes:
-#       # The volume with the sharesound fifo for snapcast to work
-#       - fifo:/tmp/snapcast
-# #    command: "snapserver -s pipe:///tmp/sharesound/snapfifo?name=Radio"
-#     # host mode is needed for snapserver advertisement
-#     network_mode: host
-#     restart: unless-stopped
-#     environment:
-#       - HOST=127.0.0.1
-
-  # mopidy:
-  #   image: ivdata/mopidy:latest
-  #   ports:
-  #     - "6600:6600"
-  #     - "6680:6680"
-  #     - "5555:5555"
-  #   depends_on:
-  #     - snapserver
-  #   volumes:
-  #     # The volume with the fifo for snapcast to work with
-  #     - fifo:/tmp/snapcast
-  #     # Makes mopidy data persistent
-  #     - mopidy_data:/mopidy
-  #     # Add local music folder
-  #     - minidlna_data:/media/music:ro
-  #   restart: unless-stopped
-  
-#  spotify:
-#    image: audiostation/spotify:latest
-#    # host mode is needed for Spotifyd advertisement
-#    network_mode: host
-#    depends_on:
-#      - snapserver
-#    volumes:
-#      # The volume with the sharesound fifo for snapcast to work
-#      - /tmp/sharesound:/tmp/sharesound
-#    restart: unless-stopped
-
diff --git a/templates/docker-compose/mopidy b/templates/docker-compose/mopidy
deleted file mode 160000
index 33dd1e2..0000000
--- a/templates/docker-compose/mopidy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33dd1e288ae80bc19a6fdbe31675d645f0f42d97
diff --git a/templates/docker-compose/upmpdcli/upmpdcli.conf b/templates/docker-compose/upmpdcli/upmpdcli.conf
index 45d34f7..05e2586 100644
--- a/templates/docker-compose/upmpdcli/upmpdcli.conf
+++ b/templates/docker-compose/upmpdcli/upmpdcli.conf
@@ -26,4 +26,5 @@ checkcontentformat = 0
 #mpdport = 6600
 #mpdpassword =
 #ownqueue = 1
-mpdhost = mopidy
+#mpdhost = mopidy
+