summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/k8s-emc/stream-site-deploy.yml6
-rw-r--r--contrib/k8s-emc/stream-site-ingress.yml4
-rw-r--r--contrib/k8s-emc/stream-site-placeholdder-deploy.yml6
-rw-r--r--contrib/k8s-emc/stream-site-placeholdder-ingress.yml4
-rw-r--r--contrib/site-emc/embed.html10
-rw-r--r--contrib/site-emc/images/thats-all-folks.jpgbin383539 -> 588399 bytes
-rw-r--r--contrib/site-emc/index.html14
7 files changed, 22 insertions, 22 deletions
diff --git a/contrib/k8s-emc/stream-site-deploy.yml b/contrib/k8s-emc/stream-site-deploy.yml
index 679470f..3e7953c 100644
--- a/contrib/k8s-emc/stream-site-deploy.yml
+++ b/contrib/k8s-emc/stream-site-deploy.yml
@@ -29,11 +29,11 @@ spec:
spec:
nodeName: emc-00
securityContext:
- runAsUser: 998
- fsGroup: 998
+ runAsUser: 990
+ fsGroup: 990
containers:
- name: nginx
- image: spreadspace/nginx-streaming:4
+ image: registry.gitlab.com/spreadspace/docker/nginx:2021-02-24.20
imagePullPolicy: Always
args:
- nginx
diff --git a/contrib/k8s-emc/stream-site-ingress.yml b/contrib/k8s-emc/stream-site-ingress.yml
index bd521f9..a9f08e9 100644
--- a/contrib/k8s-emc/stream-site-ingress.yml
+++ b/contrib/k8s-emc/stream-site-ingress.yml
@@ -11,10 +11,10 @@ metadata:
spec:
tls:
- hosts:
- - emc-stats.elev8.at
+ - stream.elev8.at
secretName: stream-elev8-tls
- hosts:
- - stream.elevte.at
+ - stream.elevate.at
secretName: stream-elevate-tls
rules:
- host: stream.elev8.at
diff --git a/contrib/k8s-emc/stream-site-placeholdder-deploy.yml b/contrib/k8s-emc/stream-site-placeholdder-deploy.yml
index 9620c95..c2ad77c 100644
--- a/contrib/k8s-emc/stream-site-placeholdder-deploy.yml
+++ b/contrib/k8s-emc/stream-site-placeholdder-deploy.yml
@@ -29,11 +29,11 @@ spec:
spec:
nodeName: emc-00
securityContext:
- runAsUser: 998
- fsGroup: 998
+ runAsUser: 990
+ fsGroup: 990
containers:
- name: nginx
- image: spreadspace/nginx-streaming:4
+ image: registry.gitlab.com/spreadspace/docker/nginx:2021-02-24.20
imagePullPolicy: Always
args:
- nginx
diff --git a/contrib/k8s-emc/stream-site-placeholdder-ingress.yml b/contrib/k8s-emc/stream-site-placeholdder-ingress.yml
index 5b10597..912fa9e 100644
--- a/contrib/k8s-emc/stream-site-placeholdder-ingress.yml
+++ b/contrib/k8s-emc/stream-site-placeholdder-ingress.yml
@@ -11,10 +11,10 @@ metadata:
spec:
tls:
- hosts:
- - emc-stats.elev8.at
+ - stream.elev8.at
secretName: stream-elev8-tls
- hosts:
- - stream.elevte.at
+ - stream.elevate.at
secretName: stream-elevate-tls
rules:
- host: stream.elev8.at
diff --git a/contrib/site-emc/embed.html b/contrib/site-emc/embed.html
index 50827c1..d079e70 100644
--- a/contrib/site-emc/embed.html
+++ b/contrib/site-emc/embed.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="css/main.css">
- <title>Elevate Festival 2020 - Live Stream</title>
+ <title>Elevate Festival 2021 - Live Stream</title>
<script type="text/javascript" src="js/clappr.min.js"></script>
<script type="text/javascript" src="js/source-selector.js"></script>
@@ -15,12 +15,11 @@
</head>
<body>
<div id="player-container" class="mx-auto embed-responsive embed-responsive-16by9">
-<!--
<div id="player" class="embed-responsive-item"></div>
--->
+<!--
<div id="player" class="embed-responsive-item"><img id="thats-all-folks" src="images/thats-all-folks.jpg" /></div>
+-->
</div>
-<!--
<script>
var player = new Clappr.Player(
{
@@ -41,12 +40,13 @@
levelSelectorConfig: { labels: {4: 'full', 3: 'high', 2: 'medium', 1: 'low', 0: 'mini'} },
});
</script>
--->
<div class="container mt-3">
<div class="row">
+<!--
<div class="col d-flex justify-content-center align-items-center"><a href="http://okto.tv"><img src="images/sponsors/okto.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://dorftv.at"><img src="images/sponsors/dorfTV.png" /></a></div>
+-->
<div class="col d-flex justify-content-center align-items-center"><a href="http://helsinki.at"><img src="images/sponsors/helsinki.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://mur.at"><img src="images/sponsors/murat.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://graz.funkfeuer.at"><img src="images/sponsors/ffgraz.png" /></a></div>
diff --git a/contrib/site-emc/images/thats-all-folks.jpg b/contrib/site-emc/images/thats-all-folks.jpg
index d40350e..e428456 100644
--- a/contrib/site-emc/images/thats-all-folks.jpg
+++ b/contrib/site-emc/images/thats-all-folks.jpg
Binary files differ
diff --git a/contrib/site-emc/index.html b/contrib/site-emc/index.html
index c1dab07..249ae68 100644
--- a/contrib/site-emc/index.html
+++ b/contrib/site-emc/index.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="css/main.css">
- <title>Elevate Festival 2020 - Live Stream</title>
+ <title>Elevate Festival 2021 - Live Stream</title>
<meta property="og:site_name" content="Elevate Festival">
<meta property="og:title" content="Elevate Festival - Livestream">
@@ -17,12 +17,12 @@
<meta property="og:image:width" content="1200">
<meta property="og:image:height" content="630">
<meta property="og:image:type" content="image/jpg">
- <meta property="og:descripton" content="Live from the Elevate Festival 2020">
+ <meta property="og:descripton" content="Live from the Elevate Festival 2021">
<meta name="twitter:card" content="summary">
<meta name="twitter:url" content="https://stream.elevate.at">
<meta name="twitter:title" content="Elevate Festival - Livestream">
- <meta name="twitter:description" content="Live from the Elevate Festival 2020">
+ <meta name="twitter:description" content="Live from the Elevate Festival 2021">
<meta name="twitter:image" content="https://stream.elevate.at/images/mediachannel.jpg">
<meta name="twitter:site" content="@elevatefestival">
@@ -39,12 +39,11 @@
</div>
<div id="player-container" class="mx-auto embed-responsive embed-responsive-16by9">
-<!--
<div id="player" class="embed-responsive-item"></div>
--->
+<!--
<div id="player" class="embed-responsive-item"><img id="thats-all-folks" src="images/thats-all-folks.jpg" /></div>
+-->
</div>
-<!--
<script>
var player = new Clappr.Player(
{
@@ -65,12 +64,13 @@
levelSelectorConfig: { labels: {4: 'full', 3: 'high', 2: 'medium', 1: 'low', 0: 'mini'} },
});
</script>
--->
<div class="container mt-3">
<div class="row">
+<!--
<div class="col d-flex justify-content-center align-items-center"><a href="http://okto.tv"><img src="images/sponsors/okto.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://dorftv.at"><img src="images/sponsors/dorfTV.png" /></a></div>
+-->
<div class="col d-flex justify-content-center align-items-center"><a href="http://helsinki.at"><img src="images/sponsors/helsinki.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://mur.at"><img src="images/sponsors/murat.png" /></a></div>
<div class="col d-flex justify-content-center align-items-center"><a href="http://graz.funkfeuer.at"><img src="images/sponsors/ffgraz.png" /></a></div>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 18:06:10 +0000