Ver código fonte

[mopidy] Split icecast to own jail

Colin Powell 3 anos atrás
pai
commit
0103d7d20c

+ 2 - 17
ansible/roles/mopidy/tasks/main.yml

@@ -15,7 +15,7 @@
 
 - name: Dependencies installed
   apt:
-    name: mopidy,mopidy-spotify,mopidy-soundcloud,mopidy-mpd,mopidy-podcast,mopidy-tunein,mopidy-local,icecast2
+    name: mopidy,mopidy-spotify,mopidy-soundcloud,mopidy-mpd,mopidy-podcast,mopidy-tunein,mopidy-local
     state: latest
 
 - name: Playlist folder exists
@@ -37,25 +37,10 @@
 - name: Mopidy dependencies up-to-date
   shell: "pip3 install mopidy-iris mopidy-muse mopidy-musicbox-webclient mopidy-mowecl mopidy-mobile mopidy-party"
 
-- name: Icecast silence.mp3 installed
-  copy:
-    src: silence.mp3
-    dest: /usr/share/icecast2/web/
-    owner: root
-    mode: 0666
-
-- name: Icecast settings installed
-  template:
-    src: icecast2.xml.j2
-    dest: /etc/icecast2/icecast.xml
-    owner: root
-    mode: 0600
-  notify: Icecast restarted
-
 - name: Mopidy settings installed
   template:
     src: mopidy.conf.j2
     dest: /etc/mopidy/mopidy.conf
     owner: root
-    mode: 0600
+    mode: 0664
   notify: Mopidy restarted

+ 3 - 3
ansible/roles/mopidy/templates/icecast2.xml.j2

@@ -65,13 +65,13 @@
 
     <!-- You may have multiple <listen-socket> elements -->
     <listen-socket>
-        <port>8000</port>
+        <port>8010</port>
         <bind-address>0.0.0.0</bind-address>
         <shoutcast-mount>/stream</shoutcast-mount>
     </listen-socket>
     <!--
     <listen-socket>
-        <port>8080</port>
+        <port>8180</port>
     </listen-socket>
     -->
     <!--
@@ -100,7 +100,7 @@
          Please refer to the documentation for a detailed explanation.
     -->
     <!--<master-server>127.0.0.1</master-server>-->
-    <!--<master-server-port>8001</master-server-port>-->
+    <!--<master-server-port>8010</master-server-port>-->
     <!--<master-update-interval>120</master-update-interval>-->
     <!--<master-password>hackme</master-password>-->
 

+ 1 - 1
ansible/roles/mopidy/templates/mopidy.conf.j2

@@ -81,4 +81,4 @@ musicbox = true
 on_track_click = ADD_THIS_BOTTOM
 
 [audio]
-output = lamemp3enc ! shout2send async=false mount=mopidy ip=127.0.0.1 port=8000 password=mainr0ot
+output = lamemp3enc ! shout2send async=false mount=mopidy ip=icecast1.local port=8010 password=mainr0ot