From a3074030348edf1bbe57affbed5adbca77aa26f1 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Fri, 30 Oct 2015 10:56:12 +0000 Subject: [PATCH] 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