diff options
| author | MaZderMind | 2016-12-18 10:37:58 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-18 10:37:58 +0100 |
| commit | 23c70f3042251675796ebff7f3568005a335fa73 (patch) | |
| tree | 547688e0ef964adb2eb28e1419e62f796f28ddd6 /configs/conferences/chaosradio | |
| parent | 738878b8b060b3cfcdde2d88a1a28d5ce83e4aa7 (diff) | |
| parent | da739f3b60a30d5dd5c7877742f8b5c292f25f46 (diff) | |
Merge branch 'feature/20-declarative-downloading'
fixes #20
Diffstat (limited to '')
| -rw-r--r-- | configs/conferences/chaosradio/config.php | 2 | ||||
| -rw-r--r-- | configs/conferences/chaosradio/download.sh | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configs/conferences/chaosradio/config.php b/configs/conferences/chaosradio/config.php index f776552..a435760 100644 --- a/configs/conferences/chaosradio/config.php +++ b/configs/conferences/chaosradio/config.php @@ -121,7 +121,7 @@ $CONFIG['CONFERENCE'] = array( * * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - 'RELIVE_JSON' => 'configs/conferences/chaosradio/vod.json', + 'RELIVE_JSON' => 'http://live.dus.c3voc.de/relive/chaosradio/index.json', ); /** diff --git a/configs/conferences/chaosradio/download.sh b/configs/conferences/chaosradio/download.sh deleted file mode 100644 index 5474658..0000000 --- a/configs/conferences/chaosradio/download.sh +++ /dev/null @@ -1,3 +0,0 @@ -# vod json -wget -q "http://live.dus.c3voc.de/relive/chaosradio/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json -rm -f /tmp/vod.json |