From 8954d6f84566bfc2cbe75783129478cc14481f5b Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sun, 11 Oct 2015 22:22:03 +0100 Subject: [PATCH 1/5] Fixed mounts --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index b3a2490..5bc5e7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,6 +66,7 @@ nginx: - "api:api" - "web:web" - "icecast:icecast" + - "radio:radio" volumes_from: - api icecast: From dda53033f6ba1655149a051fee01f87bafa3848d Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Tue, 20 Oct 2015 19:54:36 +0100 Subject: [PATCH 2/5] Edit --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7b2d7f1..011c54f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,6 @@ celery: - "redis:redis" - "rabbitmq:rabbitmq" command: ./run_celery.sh - #command: python manage.py celeryd api: build: ./dss.api From a3074030348edf1bbe57affbed5adbca77aa26f1 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Fri, 30 Oct 2015 10:56:12 +0000 Subject: [PATCH 3/5] Moved to images --- .gitignore | 3 + cleanup.sh | 0 docker-compose.yml | 54 +-- {radio => icecast}/Dockerfile | 2 +- {radio => icecast}/LICENSE.md | 0 {radio => icecast}/README.md | 0 .../etc/icecast2/admin/listclients.xsl | 202 +++++----- .../etc/icecast2/admin/listmounts.xsl | 168 ++++----- .../etc/icecast2/admin/manageauth.xsl | 196 +++++----- .../etc/icecast2/admin/moveclients.xsl | 126 +++---- .../etc/icecast2/admin/response.xsl | 112 +++--- .../etc/icecast2/admin/stats.xsl | 248 ++++++------- .../etc/icecast2/admin/updatemetadata.xsl | 134 +++---- .../etc/icecast2/admin/xspf.xsl | 0 {radio => icecast}/etc/icecast2/icecast.xml | 348 +++++++++--------- {radio => icecast}/etc/icecast2/web/auth.xsl | 114 +++--- .../etc/icecast2/web/server_version.xsl | 182 ++++----- .../etc/icecast2/web/status.xsl | 244 ++++++------ .../etc/icecast2/web/status2.xsl | 24 +- {radio => icecast}/etc/icecast2/web/style.css | 0 {radio => icecast}/etc/supervisord.conf | 0 .../examples/docker-compose.yml | 0 {radio => icecast}/start.sh | 2 - postgres/scaffold_db.sh | 3 +- rebuild.sh | 0 25 files changed, 1084 insertions(+), 1078 deletions(-) mode change 100755 => 100644 cleanup.sh rename {radio => icecast}/Dockerfile (90%) rename {radio => icecast}/LICENSE.md (100%) rename {radio => icecast}/README.md (100%) rename {radio => icecast}/etc/icecast2/admin/listclients.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/listmounts.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/manageauth.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/moveclients.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/response.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/stats.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/updatemetadata.xsl (97%) rename {radio => icecast}/etc/icecast2/admin/xspf.xsl (100%) rename {radio => icecast}/etc/icecast2/icecast.xml (97%) rename {radio => icecast}/etc/icecast2/web/auth.xsl (97%) rename {radio => icecast}/etc/icecast2/web/server_version.xsl (97%) rename {radio => icecast}/etc/icecast2/web/status.xsl (97%) rename {radio => icecast}/etc/icecast2/web/status2.xsl (98%) rename {radio => icecast}/etc/icecast2/web/style.css (100%) rename {radio => icecast}/etc/supervisord.conf (100%) rename {radio => icecast}/examples/docker-compose.yml (100%) rename {radio => icecast}/start.sh (96%) mode change 100755 => 100644 mode change 100755 => 100644 postgres/scaffold_db.sh mode change 100755 => 100644 rebuild.sh diff --git a/.gitignore b/.gitignore index 07ee2c2..8ed8060 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ dss.web dss.api dss.radio + +api_env +web_env diff --git a/cleanup.sh b/cleanup.sh old mode 100755 new mode 100644 diff --git a/docker-compose.yml b/docker-compose.yml index 8a85053..a3344f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,11 +2,14 @@ rabbitmq: image: tutum/rabbitmq environment: - RABBITMQ_PASS=wZ59kFTJZN8YQ - ports: + ports: - "4369:4369" - "5672:5672" - "15672:15672" +redis: + image: redis + postgres: restart: always image: postgres:latest @@ -15,9 +18,6 @@ postgres: ports: - "5432:5432" -redis: - image: redis - data: restart: no image: postgres:latest @@ -26,7 +26,10 @@ data: command: /bin/true celery: - build: ./dss.api + image: fergalmoran/dss.api + #build: ./dss.api + env_file: + - ./api_env volumes_from: - api links: @@ -36,45 +39,36 @@ celery: command: ./run_celery.sh api: - build: ./dss.api + image: fergalmoran/dss.api + #build: ./dss.api volumes: - /files ports: - "8001:8001" + env_file: + - ./api_env links: - "postgres:postgres" - "redis:redis" - "icecast:icecast" - - "radio:radio" - "rabbitmq:rabbitmq" command: ./run_web.sh web: + image: fergalmoran/dss.web + #build: ./dss.web + env_file: + - ./web_env restart: always - build: ./dss.web links: - "redis:redis" ports: - "8080:8080" - -nginx: - restart: always - build: ./nginx/ - ports: - - "80:80" - - "443:443" - links: - - "api:api" - - "web:web" - - "icecast:icecast" - - "radio:radio" - volumes_from: - - api icecast: - build: ./radio/ + build: ./icecast/ volumes: - ./logs:/var/log/icecast2 - - /etc/localtime:/etc/localtime:ro + - /etc/localtime:/etc/localtime:ro environment: - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0 @@ -88,4 +82,14 @@ radio: links: - "icecast:icecast" - "api:api" - +nginx: + restart: always + build: ./nginx/ + ports: + - "80:80" + - "443:443" + links: + - "api:api" + - "web:web" + - "icecast:icecast" + - "radio:radio" diff --git a/radio/Dockerfile b/icecast/Dockerfile similarity index 90% rename from radio/Dockerfile rename to icecast/Dockerfile index fd18a17..bd5a927 100644 --- a/radio/Dockerfile +++ b/icecast/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:trusty -MAINTAINER Manfred Touron "m@42.am" +MAINTAINER Fergal Moran "Ferg@lMoran.me" ENV DEBIAN_FRONTEND noninteractive diff --git a/radio/LICENSE.md b/icecast/LICENSE.md similarity index 100% rename from radio/LICENSE.md rename to icecast/LICENSE.md diff --git a/radio/README.md b/icecast/README.md similarity index 100% rename from radio/README.md rename to icecast/README.md diff --git a/radio/etc/icecast2/admin/listclients.xsl b/icecast/etc/icecast2/admin/listclients.xsl similarity index 97% rename from radio/etc/icecast2/admin/listclients.xsl rename to icecast/etc/icecast2/admin/listclients.xsl index 2fb7fe9..fa5a77d 100644 --- a/radio/etc/icecast2/admin/listclients.xsl +++ b/icecast/etc/icecast2/admin/listclients.xsl @@ -1,101 +1,101 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - - -

Listener Stats

-
-
- -
-
- -
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - - -
- List Clients - Move Listeners - Update Metadata - Kill Source -
-
- - - - - - - - - - - - - - - - -
IP
Seconds Connected
User Agent
Action
()Kick
-
-
- -  -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + + +

Listener Stats

+
+
+ +
+
+ +
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source +
+
+ + + + + + + + + + + + + + + + +
IP
Seconds Connected
User Agent
Action
()Kick
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/admin/listmounts.xsl b/icecast/etc/icecast2/admin/listmounts.xsl similarity index 97% rename from radio/etc/icecast2/admin/listmounts.xsl rename to icecast/etc/icecast2/admin/listmounts.xsl index 23f9276..2028bbc 100644 --- a/radio/etc/icecast2/admin/listmounts.xsl +++ b/icecast/etc/icecast2/admin/listmounts.xsl @@ -1,84 +1,84 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - -

Active Mountpoints

-
-
- -
-
- -
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - - -
- List Clients - Move Listeners - Update Metadata - Kill Source - Manage Authentication -
-
-

Listener(s)

-

- -  -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + +

Active Mountpoints

+
+
+ +
+
+ +
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source + Manage Authentication +
+
+

Listener(s)

+

+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/admin/manageauth.xsl b/icecast/etc/icecast2/admin/manageauth.xsl similarity index 97% rename from radio/etc/icecast2/admin/manageauth.xsl rename to icecast/etc/icecast2/admin/manageauth.xsl index 4c1ab9d..25a3610 100644 --- a/radio/etc/icecast2/admin/manageauth.xsl +++ b/icecast/etc/icecast2/admin/manageauth.xsl @@ -1,98 +1,98 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- -
-
- -
-
- - - - -

- -()

- - - -
- List Clients - Move Listeners - Update Metadata - Kill Source -
-

-
- - - - - - - - - - - - -
User Id
delete
- - - - - - - - - - - - -
User IdPassword
- - -
-
-
- -  -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ +
+
+ +
+
+ + + + +

+ +()

+ + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source +
+

+
+ + + + + + + + + + + + +
User Id
delete
+ + + + + + + + + + + + +
User IdPassword
+ + +
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/admin/moveclients.xsl b/icecast/etc/icecast2/admin/moveclients.xsl similarity index 97% rename from radio/etc/icecast2/admin/moveclients.xsl rename to icecast/etc/icecast2/admin/moveclients.xsl index 99a8a9e..43112f1 100644 --- a/radio/etc/icecast2/admin/moveclients.xsl +++ b/icecast/etc/icecast2/admin/moveclients.xsl @@ -1,63 +1,63 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - -

Moving Listeners From ()

-
-
- -
-
-

Move to which mountpoint ?

- - - - - - - -
Move from () to () ListenersMove Clients
-
-
- -  -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + +

Moving Listeners From ()

+
+
+ +
+
+

Move to which mountpoint ?

+ + + + + + + +
Move from () to () ListenersMove Clients
+
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/radio/etc/icecast2/admin/response.xsl b/icecast/etc/icecast2/admin/response.xsl similarity index 97% rename from radio/etc/icecast2/admin/response.xsl rename to icecast/etc/icecast2/admin/response.xsl index 6c584b4..c75af8d 100644 --- a/radio/etc/icecast2/admin/response.xsl +++ b/icecast/etc/icecast2/admin/response.xsl @@ -1,56 +1,56 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home | - List Mountpoints | - Move Listeners | - Index -
-
- -
-
-
-
- -

Icecast Server Response

-
-
- -
-
-

Response

- -Message :

-Return Code:

- -
-
-
-
- -
-
-
Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ +

Icecast Server Response

+
+
+ +
+
+

Response

+ +Message :

+Return Code:

+ +
+
+
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/radio/etc/icecast2/admin/stats.xsl b/icecast/etc/icecast2/admin/stats.xsl similarity index 97% rename from radio/etc/icecast2/admin/stats.xsl rename to icecast/etc/icecast2/admin/stats.xsl index e09f249..a3cc614 100644 --- a/radio/etc/icecast2/admin/stats.xsl +++ b/icecast/etc/icecast2/admin/stats.xsl @@ -1,124 +1,124 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - - -
-
- -
-
-

Global Server Stats

- - - - - - - - - - - -
-
-
- -
-
-
-
- - - - - -
-
- -
-
-
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - -
- List Clients - Move MountPoints - Update Metadata - Kill Source - Manage Authentication -
-
- - - - - - - -
-
-
- -
-
-
-
- - -  - - - -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + + +
+
+ +
+
+

Global Server Stats

+ + + + + + + + + + + +
+
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + +
+ List Clients + Move MountPoints + Update Metadata + Kill Source + Manage Authentication +
+
+ + + + + + + +
+
+
+ +
+
+
+
+ + +  + + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/admin/updatemetadata.xsl b/icecast/etc/icecast2/admin/updatemetadata.xsl similarity index 97% rename from radio/etc/icecast2/admin/updatemetadata.xsl rename to icecast/etc/icecast2/admin/updatemetadata.xsl index 0d86aa5..55bde7c 100644 --- a/radio/etc/icecast2/admin/updatemetadata.xsl +++ b/icecast/etc/icecast2/admin/updatemetadata.xsl @@ -1,67 +1,67 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- -

Update Metadata

-
-
- -
-
- -

- -()

- -
- - - -
Metadata :
- - - -
- -
-
- -  -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ +

Update Metadata

+
+
+ +
+
+ +

+ +()

+ +
+ + + +
Metadata :
+ + + +
+ +
+
+ +  +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/admin/xspf.xsl b/icecast/etc/icecast2/admin/xspf.xsl similarity index 100% rename from radio/etc/icecast2/admin/xspf.xsl rename to icecast/etc/icecast2/admin/xspf.xsl diff --git a/radio/etc/icecast2/icecast.xml b/icecast/etc/icecast2/icecast.xml similarity index 97% rename from radio/etc/icecast2/icecast.xml rename to icecast/etc/icecast2/icecast.xml index 8c5835a..c2a6d22 100644 --- a/radio/etc/icecast2/icecast.xml +++ b/icecast/etc/icecast2/icecast.xml @@ -1,174 +1,174 @@ - - - 1000 - 42 - 5 - 524288 - 30 - 15 - 10 - - 1 - - 65535 - - - - - hackme - - hackme - - - admin - hackme - - - - - - - - - localhost - - - - 8000 - - - - - - - - - - - - - - - - - - 1 - - - - /usr/share/icecast2 - - - /var/log/icecast2 - /usr/share/icecast2/web - /usr/share/icecast2/admin - - - - - - - - - - access.log - error.log - - 3 - 10000 - - - - - - 0 - - - + + + 1000 + 42 + 5 + 524288 + 30 + 15 + 10 + + 1 + + 65535 + + + + + hackme + + hackme + + + admin + hackme + + + + + + + + + localhost + + + + 8000 + + + + + + + + + + + + + + + + + + 1 + + + + /usr/share/icecast2 + + + /var/log/icecast2 + /usr/share/icecast2/web + /usr/share/icecast2/admin + + + + + + + + + + access.log + error.log + + 3 + 10000 + + + + + + 0 + + + diff --git a/radio/etc/icecast2/web/auth.xsl b/icecast/etc/icecast2/web/auth.xsl similarity index 97% rename from radio/etc/icecast2/web/auth.xsl rename to icecast/etc/icecast2/web/auth.xsl index 0d8c97e..cc3fc79 100644 --- a/radio/etc/icecast2/web/auth.xsl +++ b/icecast/etc/icecast2/web/auth.xsl @@ -1,57 +1,57 @@ - - - - - -Icecast Streaming Media Server - - - - - - - - -
-

Authorization Page

-
-
- -
-
- - - - - -

()

-
- - - - -
Username :
Password :
- -
- - - -

- Not Connected

- - -

-

- -  -
-
- -
-
-



-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + + + + + + +
+

Authorization Page

+
+
+ +
+
+ + + + + +

()

+
+ + + + +
Username :
Password :
+ +
+ + + +

- Not Connected

+ + +

+

+ +  +
+
+ +
+
+



+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/web/server_version.xsl b/icecast/etc/icecast2/web/server_version.xsl similarity index 97% rename from radio/etc/icecast2/web/server_version.xsl rename to icecast/etc/icecast2/web/server_version.xsl index bcf610b..5fd5c5f 100644 --- a/radio/etc/icecast2/web/server_version.xsl +++ b/icecast/etc/icecast2/web/server_version.xsl @@ -1,91 +1,91 @@ - - - - - -Icecast Streaming Media Server - - - -

Server Information

-
- -
-
- -
- - - - -
- Administration - Server Status - Version
-
- -
-
-
-
- - -
-
- -
-
-

Server Information

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Location
Admin
Host
Version
Downloadicecast.org
Subversionclick here
Documentationclick here
Stream Directory dir.xiph.org
Communityforum.icecast.org
-
-
- -
-
-
-
- -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Server Information

+
+ +
+
+ +
+ + + + +
+ Administration + Server Status + Version
+
+ +
+
+
+
+ + +
+
+ +
+
+

Server Information

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Location
Admin
Host
Version
Downloadicecast.org
Subversionclick here
Documentationclick here
Stream Directory dir.xiph.org
Communityforum.icecast.org
+
+
+ +
+
+
+
+ +
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/web/status.xsl b/icecast/etc/icecast2/web/status.xsl similarity index 97% rename from radio/etc/icecast2/web/status.xsl rename to icecast/etc/icecast2/web/status.xsl index b7049a2..caa932f 100644 --- a/radio/etc/icecast2/web/status.xsl +++ b/icecast/etc/icecast2/web/status.xsl @@ -1,122 +1,122 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Status

-
- -
-
- -
- - - - -
- Administration - Server Status - Version
-
- -
-
-
-
- - - - - -
-
- -
-
-
- - - - - - - - - - - - - -

Mount Point

Login M3U XSPF
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Stream Title:
Stream Description:
Content Type:
Mount started:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song: - -
-
-
- -
-
-
-
- - -

- Not Connected

- - - - -  - - -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Status

+
+ +
+
+ +
+ + + + +
+ Administration + Server Status + Version
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+
+ + + + + + + + + + + + + +

Mount Point

Login M3U XSPF
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Stream Title:
Stream Description:
Content Type:
Mount started:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song: + -
+
+
+ +
+
+
+
+ + +

- Not Connected

+ + + + +  + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/radio/etc/icecast2/web/status2.xsl b/icecast/etc/icecast2/web/status2.xsl similarity index 98% rename from radio/etc/icecast2/web/status2.xsl rename to icecast/etc/icecast2/web/status2.xsl index 689dbef..3f44d3b 100644 --- a/radio/etc/icecast2/web/status2.xsl +++ b/icecast/etc/icecast2/web/status2.xsl @@ -1,12 +1,12 @@ - - - -
-MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
-Global,Client: Source: ,,,,
-
-,,,,, - ,
-
-
- - + + + +
+MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
+Global,Client: Source: ,,,,
+
+,,,,, - ,
+
+
+ + diff --git a/radio/etc/icecast2/web/style.css b/icecast/etc/icecast2/web/style.css similarity index 100% rename from radio/etc/icecast2/web/style.css rename to icecast/etc/icecast2/web/style.css diff --git a/radio/etc/supervisord.conf b/icecast/etc/supervisord.conf similarity index 100% rename from radio/etc/supervisord.conf rename to icecast/etc/supervisord.conf diff --git a/radio/examples/docker-compose.yml b/icecast/examples/docker-compose.yml similarity index 100% rename from radio/examples/docker-compose.yml rename to icecast/examples/docker-compose.yml diff --git a/radio/start.sh b/icecast/start.sh old mode 100755 new mode 100644 similarity index 96% rename from radio/start.sh rename to icecast/start.sh index 79dc99b..ca93e6a --- a/radio/start.sh +++ b/icecast/start.sh @@ -20,6 +20,4 @@ if [ -n "$ICECAST_PASSWORD" ]; then sed -i "s/[^<]*<\/password>/$ICECAST_PASSWORD<\/password>/g" /etc/icecast2/icecast.xml fi -cat /etc/icecast2/icecast.xml - supervisord -n -c /etc/supervisord.conf diff --git a/postgres/scaffold_db.sh b/postgres/scaffold_db.sh old mode 100755 new mode 100644 index b0a56fb..0454bd7 --- a/postgres/scaffold_db.sh +++ b/postgres/scaffold_db.sh @@ -1,5 +1,6 @@ #!/bin/bash +sudo -u postgres psql -h 127.0.0.1 -c "CREATE DATABASE deepsouthsounds" sudo -u postgres psql -h 127.0.0.1 -c "CREATE USER deepsouthsounds WITH PASSWORD 'deepsouthsounds'" sudo -u postgres psql -h 127.0.0.1 -c "CREATE DATABASE deepsouthsounds OWNER deepsouthsounds" -sudo -u postgres psql -h 127.0.0.1 deepsouthsounds < /home/fergalm/Dropbox/dss.sql \ No newline at end of file +sudo -u postgres psql -h 127.0.0.1 deepsouthsounds < /tmp/20151025-203518.sql diff --git a/rebuild.sh b/rebuild.sh old mode 100755 new mode 100644 From deb989538335fae36f00b7a5b7551e46790d7fcb Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sun, 1 Nov 2015 14:26:26 +0000 Subject: [PATCH 4/5] Moving to images --- .gitignore | 1 + .ropeproject/globalnames | Bin 15457 -> 15457 bytes cleanup.sh | 0 docker-compose.yml | 7 +- icecast/etc/icecast2/admin/listclients.xsl | 202 +++++----- icecast/etc/icecast2/admin/listmounts.xsl | 168 ++++----- icecast/etc/icecast2/admin/manageauth.xsl | 196 +++++----- icecast/etc/icecast2/admin/moveclients.xsl | 126 +++---- icecast/etc/icecast2/admin/response.xsl | 112 +++--- icecast/etc/icecast2/admin/stats.xsl | 248 ++++++------- icecast/etc/icecast2/admin/updatemetadata.xsl | 134 +++---- icecast/etc/icecast2/icecast.xml | 348 +++++++++--------- icecast/etc/icecast2/web/auth.xsl | 114 +++--- icecast/etc/icecast2/web/server_version.xsl | 182 ++++----- icecast/etc/icecast2/web/status.xsl | 244 ++++++------ icecast/etc/icecast2/web/status2.xsl | 24 +- icecast/start.sh | 0 postgres/scaffold_db.sh | 0 rebuild.sh | 0 19 files changed, 1055 insertions(+), 1051 deletions(-) mode change 100644 => 100755 cleanup.sh mode change 100644 => 100755 icecast/start.sh mode change 100644 => 100755 postgres/scaffold_db.sh mode change 100644 => 100755 rebuild.sh diff --git a/.gitignore b/.gitignore index 8ed8060..070a20f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dss.radio api_env web_env +radio_env diff --git a/.ropeproject/globalnames b/.ropeproject/globalnames index c2b51329167d86829f9bd0490a76bac9b58063ba..add4d5a3e40a0cdf4ca201a46551202ca3be11cb 100644 GIT binary patch literal 15457 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 S+61m42D;$3dA*V5^nU^G64QqO literal 15457 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 RF?HV<=z<^S^hO#}{|8np)fE5$ diff --git a/cleanup.sh b/cleanup.sh old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index a3344f3..426edb9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,7 @@ api: web: image: fergalmoran/dss.web #build: ./dss.web - env_file: + env_file: - ./web_env restart: always links: @@ -76,7 +76,10 @@ icecast: ports: - 8000:8000 radio: - build: dss.radio/ + image: fergalmoran/dss.radio + env_file: + - ./radio_env + #build: dss.radio/ ports: - "8888:8888" links: diff --git a/icecast/etc/icecast2/admin/listclients.xsl b/icecast/etc/icecast2/admin/listclients.xsl index fa5a77d..2fb7fe9 100644 --- a/icecast/etc/icecast2/admin/listclients.xsl +++ b/icecast/etc/icecast2/admin/listclients.xsl @@ -1,101 +1,101 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - - -

Listener Stats

-
-
- -
-
- -
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - - -
- List Clients - Move Listeners - Update Metadata - Kill Source -
-
- - - - - - - - - - - - - - - - -
IP
Seconds Connected
User Agent
Action
()Kick
-
-
- -&nbsp; -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + + +

Listener Stats

+
+
+ +
+
+ +
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source +
+
+ + + + + + + + + + + + + + + + +
IP
Seconds Connected
User Agent
Action
()Kick
+
+
+ +&nbsp; +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/admin/listmounts.xsl b/icecast/etc/icecast2/admin/listmounts.xsl index 2028bbc..23f9276 100644 --- a/icecast/etc/icecast2/admin/listmounts.xsl +++ b/icecast/etc/icecast2/admin/listmounts.xsl @@ -1,84 +1,84 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - -

Active Mountpoints

-
-
- -
-
- -
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - - -
- List Clients - Move Listeners - Update Metadata - Kill Source - Manage Authentication -
-
-

Listener(s)

-

- -&nbsp; -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + +

Active Mountpoints

+
+
+ +
+
+ +
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source + Manage Authentication +
+
+

Listener(s)

+

+ +&nbsp; +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/admin/manageauth.xsl b/icecast/etc/icecast2/admin/manageauth.xsl index 25a3610..4c1ab9d 100644 --- a/icecast/etc/icecast2/admin/manageauth.xsl +++ b/icecast/etc/icecast2/admin/manageauth.xsl @@ -1,98 +1,98 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- -
-
- -
-
- - - - -

- -()

- - - -
- List Clients - Move Listeners - Update Metadata - Kill Source -
-

-
- - - - - - - - - - - - -
User Id
delete
- - - - - - - - - - - - -
User IdPassword
- - -
-
-
- -&nbsp; -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ +
+
+ +
+
+ + + + +

+ +()

+ + + +
+ List Clients + Move Listeners + Update Metadata + Kill Source +
+

+
+ + + + + + + + + + + + +
User Id
delete
+ + + + + + + + + + + + +
User IdPassword
+ + +
+
+
+ +&nbsp; +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/admin/moveclients.xsl b/icecast/etc/icecast2/admin/moveclients.xsl index 43112f1..99a8a9e 100644 --- a/icecast/etc/icecast2/admin/moveclients.xsl +++ b/icecast/etc/icecast2/admin/moveclients.xsl @@ -1,63 +1,63 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - -

Moving Listeners From ()

-
-
- -
-
-

Move to which mountpoint ?

- - - - - - - -
Move from () to () ListenersMove Clients
-
-
- -&nbsp; -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + +

Moving Listeners From ()

+
+
+ +
+
+

Move to which mountpoint ?

+ + + + + + + +
Move from () to () ListenersMove Clients
+
+
+ +&nbsp; +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/icecast/etc/icecast2/admin/response.xsl b/icecast/etc/icecast2/admin/response.xsl index c75af8d..6c584b4 100644 --- a/icecast/etc/icecast2/admin/response.xsl +++ b/icecast/etc/icecast2/admin/response.xsl @@ -1,56 +1,56 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home | - List Mountpoints | - Move Listeners | - Index -
-
- -
-
-
-
- -

Icecast Server Response

-
-
- -
-
-

Response

- -Message :

-Return Code:

- -
-
-
-
- -
-
-
Support icecast development at www.icecast.org
- - - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home | + List Mountpoints | + Move Listeners | + Index +
+
+ +
+
+
+
+ +

Icecast Server Response

+
+
+ +
+
+

Response

+ +Message :

+Return Code:

+ +
+
+
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + + diff --git a/icecast/etc/icecast2/admin/stats.xsl b/icecast/etc/icecast2/admin/stats.xsl index a3cc614..e09f249 100644 --- a/icecast/etc/icecast2/admin/stats.xsl +++ b/icecast/etc/icecast2/admin/stats.xsl @@ -1,124 +1,124 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- - - -
-
- -
-
-

Global Server Stats

- - - - - - - - - - - -
-
-
- -
-
-
-
- - - - - -
-
- -
-
-
- - - - - - - - - - - - - -

Mount Point

Login - M3U - XSPF
-
- - - -
- List Clients - Move MountPoints - Update Metadata - Kill Source - Manage Authentication -
-
- - - - - - - -
-
-
- -
-
-
-
- - -&nbsp; - - - -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ + + +
+
+ +
+
+

Global Server Stats

+ + + + + + + + + + + +
+
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+
+ + + + + + + + + + + + + +

Mount Point

Login + M3U + XSPF
+
+ + + +
+ List Clients + Move MountPoints + Update Metadata + Kill Source + Manage Authentication +
+
+ + + + + + + +
+
+
+ +
+
+
+
+ + +&nbsp; + + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/admin/updatemetadata.xsl b/icecast/etc/icecast2/admin/updatemetadata.xsl index 55bde7c..0d86aa5 100644 --- a/icecast/etc/icecast2/admin/updatemetadata.xsl +++ b/icecast/etc/icecast2/admin/updatemetadata.xsl @@ -1,67 +1,67 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Admin

-
- -
-
- -
- - - -
- Admin Home - List Mountpoints - Move Listeners - Index -
-
- -
-
-
-
- -

Update Metadata

-
-
- -
-
- -

- -()

- -
- - - -
Metadata :
- - - -
- -
-
- -&nbsp; -
-
- -
-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Admin

+
+ +
+
+ +
+ + + +
+ Admin Home + List Mountpoints + Move Listeners + Index +
+
+ +
+
+
+
+ +

Update Metadata

+
+
+ +
+
+ +

+ +()

+ +
+ + + +
Metadata :
+ + + +
+ +
+
+ +&nbsp; +
+
+ +
+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/icecast.xml b/icecast/etc/icecast2/icecast.xml index c2a6d22..8c5835a 100644 --- a/icecast/etc/icecast2/icecast.xml +++ b/icecast/etc/icecast2/icecast.xml @@ -1,174 +1,174 @@ - - - 1000 - 42 - 5 - 524288 - 30 - 15 - 10 - - 1 - - 65535 - - - - - hackme - - hackme - - - admin - hackme - - - - - - - - - localhost - - - - 8000 - - - - - - - - - - - - - - - - - - 1 - - - - /usr/share/icecast2 - - - /var/log/icecast2 - /usr/share/icecast2/web - /usr/share/icecast2/admin - - - - - - - - - - access.log - error.log - - 3 - 10000 - - - - - - 0 - - - + + + 1000 + 42 + 5 + 524288 + 30 + 15 + 10 + + 1 + + 65535 + + + + + hackme + + hackme + + + admin + hackme + + + + + + + + + localhost + + + + 8000 + + + + + + + + + + + + + + + + + + 1 + + + + /usr/share/icecast2 + + + /var/log/icecast2 + /usr/share/icecast2/web + /usr/share/icecast2/admin + + + + + + + + + + access.log + error.log + + 3 + 10000 + + + + + + 0 + + + diff --git a/icecast/etc/icecast2/web/auth.xsl b/icecast/etc/icecast2/web/auth.xsl index cc3fc79..0d8c97e 100644 --- a/icecast/etc/icecast2/web/auth.xsl +++ b/icecast/etc/icecast2/web/auth.xsl @@ -1,57 +1,57 @@ - - - - - -Icecast Streaming Media Server - - - - - - - - -
-

Authorization Page

-
-
- -
-
- - - - - -

()

-
- - - - -
Username :
Password :
- -
- - - -

- Not Connected

- - -

-

- -&nbsp; -
-
- -
-
-



-
-
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + + + + + + +
+

Authorization Page

+
+
+ +
+
+ + + + + +

()

+
+ + + + +
Username :
Password :
+ +
+ + + +

- Not Connected

+ + +

+

+ +&nbsp; +
+
+ +
+
+



+
+
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/web/server_version.xsl b/icecast/etc/icecast2/web/server_version.xsl index 5fd5c5f..bcf610b 100644 --- a/icecast/etc/icecast2/web/server_version.xsl +++ b/icecast/etc/icecast2/web/server_version.xsl @@ -1,91 +1,91 @@ - - - - - -Icecast Streaming Media Server - - - -

Server Information

-
- -
-
- -
- - - - -
- Administration - Server Status - Version
-
- -
-
-
-
- - -
-
- -
-
-

Server Information

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Location
Admin
Host
Version
Downloadicecast.org
Subversionclick here
Documentationclick here
Stream Directory dir.xiph.org
Communityforum.icecast.org
-
-
- -
-
-
-
- -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Server Information

+
+ +
+
+ +
+ + + + +
+ Administration + Server Status + Version
+
+ +
+
+
+
+ + +
+
+ +
+
+

Server Information

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Location
Admin
Host
Version
Downloadicecast.org
Subversionclick here
Documentationclick here
Stream Directory dir.xiph.org
Communityforum.icecast.org
+
+
+ +
+
+
+
+ +
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/web/status.xsl b/icecast/etc/icecast2/web/status.xsl index caa932f..b7049a2 100644 --- a/icecast/etc/icecast2/web/status.xsl +++ b/icecast/etc/icecast2/web/status.xsl @@ -1,122 +1,122 @@ - - - - - -Icecast Streaming Media Server - - - -

Icecast2 Status

-
- -
-
- -
- - - - -
- Administration - Server Status - Version
-
- -
-
-
-
- - - - - -
-
- -
-
-
- - - - - - - - - - - - - -

Mount Point

Login M3U XSPF
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Stream Title:
Stream Description:
Content Type:
Mount started:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song: - -
-
-
- -
-
-
-
- - -

- Not Connected

- - - - -&nbsp; - - -
Support icecast development at www.icecast.org
- - - - + + + + + +Icecast Streaming Media Server + + + +

Icecast2 Status

+
+ +
+
+ +
+ + + + +
+ Administration + Server Status + Version
+
+ +
+
+
+
+ + + + + +
+
+ +
+
+
+ + + + + + + + + + + + + +

Mount Point

Login M3U XSPF
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Stream Title:
Stream Description:
Content Type:
Mount started:
Bitrate:
Quality:
Video Quality:
Framesize:
Framerate:
Current Listeners:
Peak Listeners:
Stream Genre:
Stream URL:
Current Song: + -
+
+
+ +
+
+
+
+ + +

- Not Connected

+ + + + +&nbsp; + + +
Support icecast development at www.icecast.org
+ + + + diff --git a/icecast/etc/icecast2/web/status2.xsl b/icecast/etc/icecast2/web/status2.xsl index 3f44d3b..689dbef 100644 --- a/icecast/etc/icecast2/web/status2.xsl +++ b/icecast/etc/icecast2/web/status2.xsl @@ -1,12 +1,12 @@ - - - -
-MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
-Global,Client: Source: ,,,,
-
-,,,,, - ,
-
-
- - + + + +
+MountPoint,Connections,Stream Name,Current Listeners,Description,Currently Playing,Stream URL 
+Global,Client: Source: ,,,,
+
+,,,,, - ,
+
+
+ + diff --git a/icecast/start.sh b/icecast/start.sh old mode 100644 new mode 100755 diff --git a/postgres/scaffold_db.sh b/postgres/scaffold_db.sh old mode 100644 new mode 100755 diff --git a/rebuild.sh b/rebuild.sh old mode 100644 new mode 100755 From f41923c6af5b4ba54448ef79721da898349bea7d Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sun, 1 Nov 2015 14:31:47 +0000 Subject: [PATCH 5/5] Moved to images --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 426edb9..ce526cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,6 @@ data: celery: image: fergalmoran/dss.api - #build: ./dss.api env_file: - ./api_env volumes_from: @@ -40,7 +39,6 @@ celery: api: image: fergalmoran/dss.api - #build: ./dss.api volumes: - /files ports: @@ -56,7 +54,6 @@ api: web: image: fergalmoran/dss.web - #build: ./dss.web env_file: - ./web_env restart: always @@ -79,7 +76,6 @@ radio: image: fergalmoran/dss.radio env_file: - ./radio_env - #build: dss.radio/ ports: - "8888:8888" links: