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 | |
| parent | 738878b8b060b3cfcdde2d88a1a28d5ce83e4aa7 (diff) | |
| parent | da739f3b60a30d5dd5c7877742f8b5c292f25f46 (diff) | |
Merge branch 'feature/20-declarative-downloading'
fixes #20
Diffstat (limited to '')
| -rw-r--r-- | configs/conferences/32c3/config.php | 6 | ||||
| -rw-r--r-- | configs/conferences/chaosradio/config.php | 2 | ||||
| -rw-r--r-- | configs/conferences/chaosradio/download.sh | 3 | ||||
| -rw-r--r-- | configs/conferences/datengarten/config.php | 3 | ||||
| -rw-r--r-- | configs/conferences/datengarten/download.sh | 3 |
5 files changed, 8 insertions, 9 deletions
diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php index eda9450..f1cc5a6 100644 --- a/configs/conferences/32c3/config.php +++ b/configs/conferences/32c3/config.php @@ -667,5 +667,11 @@ $CONFIG['TWITTER'] = array( 'TEXT' => '#32C3 #%s', ); +$CONFIG['EXTRA_FILES'] = array( + 'schedule.xml' => 'https://events.ccc.de/congress/2015/Fahrplan/schedule.xml', + 'schedule.json' => 'https://events.ccc.de/congress/2015/Fahrplan/schedule.json', + 'everything.schedule.xml' => 'http://data.testi.ber.c3voc.de/32C3/everything.schedule.xml', + 'everything.schedule.json' => 'http://data.testi.ber.c3voc.de/32C3/everything.schedule.json', +); return $CONFIG; 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 diff --git a/configs/conferences/datengarten/config.php b/configs/conferences/datengarten/config.php index e2e21eb..f8514be 100644 --- a/configs/conferences/datengarten/config.php +++ b/configs/conferences/datengarten/config.php @@ -117,8 +117,7 @@ $CONFIG['CONFERENCE'] = array( * * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - //'RELIVE_JSON' => 'configs/vod.json', - 'RELIVE_JSON' => 'configs/conferences/datengarten/vod.json', + 'RELIVE_JSON' => 'http://live.dus.c3voc.de/relive/datengarten/index.json', ); /** diff --git a/configs/conferences/datengarten/download.sh b/configs/conferences/datengarten/download.sh deleted file mode 100644 index 5834c4b..0000000 --- a/configs/conferences/datengarten/download.sh +++ /dev/null @@ -1,3 +0,0 @@ -# vod json -wget -q "http://live.dus.c3voc.de/relive/datengarten/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json -rm -f /tmp/vod.json |