From b75294120fec525baa4edd6a0ec23a4223b9e8b8 Mon Sep 17 00:00:00 2001
From: root
Date: Mon, 13 Jun 2016 16:10:12 +0200
Subject: local changs from thomic/meise?

---
 configs/conferences/jh-nord-2016/config.php  | 2 +-
 configs/conferences/jh-nord-2016/download.sh | 2 +-
 configs/conferences/jh-sued-2016/config.php  | 2 +-
 configs/conferences/jh-sued-2016/download.sh | 2 +-
 configs/conferences/jh-west-2016/config.php  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/conferences/jh-nord-2016/config.php b/configs/conferences/jh-nord-2016/config.php
index 600d227..39e6427 100644
--- a/configs/conferences/jh-nord-2016/config.php
+++ b/configs/conferences/jh-nord-2016/config.php
@@ -82,7 +82,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
 	 * Link zu den Recordings
 	 * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt
 	 */
-	'RELEASES' => 'http://media.ccc.de/browse/conferences/jh/jh-nord-2016/',
+	'RELEASES' => 'https://media.ccc.de/b/events/jugendhackt/2016',
 
 	/**
 	 * Link zu einer (externen) ReLive-Übersichts-Seite
diff --git a/configs/conferences/jh-nord-2016/download.sh b/configs/conferences/jh-nord-2016/download.sh
index 3b94d5b..1ad9b5c 100755
--- a/configs/conferences/jh-nord-2016/download.sh
+++ b/configs/conferences/jh-nord-2016/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # fahrplan
-#wget --no-check-certificate -q "https://entropia.de/GPN16:Fahrplan:XML?action=raw" -O /tmp/gpn16-schedule.xml && mv /tmp/gpn16-schedule.xml schedule.xml
+wget --no-check-certificate -q "http://data.c3voc.de/schedule/jh16/schedule-nord.xml" -O /tmp/jh16-nord-schedule.xml && mv /tmp/jh16-nord-schedule.xml schedule.xml
 
 # relive
 wget -q "http://live.dus.c3voc.de/relive/jh-sued-2016/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
diff --git a/configs/conferences/jh-sued-2016/config.php b/configs/conferences/jh-sued-2016/config.php
index 64f82e0..85c76a7 100644
--- a/configs/conferences/jh-sued-2016/config.php
+++ b/configs/conferences/jh-sued-2016/config.php
@@ -82,7 +82,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
 	 * Link zu den Recordings
 	 * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt
 	 */
-	'RELEASES' => 'http://media.ccc.de/browse/conferences/jh/jh-sued-2016/',
+	'RELEASES' => 'https://media.ccc.de/b/events/jugendhackt/2016',
 
 	/**
 	 * Link zu einer (externen) ReLive-Übersichts-Seite
diff --git a/configs/conferences/jh-sued-2016/download.sh b/configs/conferences/jh-sued-2016/download.sh
index 3b94d5b..e87189e 100755
--- a/configs/conferences/jh-sued-2016/download.sh
+++ b/configs/conferences/jh-sued-2016/download.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # fahrplan
-#wget --no-check-certificate -q "https://entropia.de/GPN16:Fahrplan:XML?action=raw" -O /tmp/gpn16-schedule.xml && mv /tmp/gpn16-schedule.xml schedule.xml
+wget --no-check-certificate -q "http://data.c3voc.de/schedule/jh16/schedule-sued.xml" -O /tmp/jh16-sued-schedule.xml && mv /tmp/jh16-sued-schedule.xml schedule.xml
 
 # relive
 wget -q "http://live.dus.c3voc.de/relive/jh-sued-2016/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json
diff --git a/configs/conferences/jh-west-2016/config.php b/configs/conferences/jh-west-2016/config.php
index 8fb4195..c6eb893 100644
--- a/configs/conferences/jh-west-2016/config.php
+++ b/configs/conferences/jh-west-2016/config.php
@@ -26,7 +26,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
 	 * Der Boolean true ist aus Abwärtskompatibilitätsgründen äquivalent zu 'after'. False ist äquivalent
 	 * zu 'running'.
 	 */
-	'CLOSED' => false,
+	'CLOSED' => true,
 
 	/**
 	 * Titel der Konferenz (kann Leer- und Sonderzeichen enthalten)
-- 
cgit v1.2.3