Differences

This shows you the differences between two versions of the page.

--- docu:software [2016/09/12 00:24] – [Video Mixer] v0tti
+++ docu:software [2018/08/27 21:18] (current) – [Linux / Admin / CDN] meise
@@ Line 13: / Line 13: @@
 == Video Mixer
   * [[:voctomix | voctomix]]
   * Not in use:
@@ Line 37: / Line 38: @@
     * [[:operation:cutting | how to cut recordings]]
     * [[:operation:checking | how to check recordings]]
-  * [[https://github.com/voc/intro-outro-generator | Intro / Outro generator ]]
+    * [[projects:fuse-ts]]
+  * [[projects:intro-outro-generator | Intro / Outro generator ]]
   * [[:centralStorage | central storage]]
 === Video publishing / streaming
-  * [[:media.ccc.de | media.ccc.de]]
+  * [[software:voctoweb | voctoweb - our media portal]]
-    * https://github.com/voc/media.ccc.de
+    * [[:media.ccc.de | media.ccc.de - notes on our voctoweb installation]]
-  * [[operation:publishing ]] [[ https://github.com/voc/publishing | publishing script for youtube, media.ccc.de with c3tracker]]
+    * [[operation:publishing | notes on our publishing process]]
@@ Line 58: / Line 60: @@
 == Monitoring
   * [[https://github.com/FremaksGmbH/c3netmon-public | NOC dashboard]]
-  * [[:viriwarnlampe]]
+  * [[:viriwarninglamp]]
 == Linux / Admin / CDN
@@ Line 64: / Line 66: @@
   * [[intern:KVM|KVM]]
   * [[intern:screen | screen]]
-  * [[intern:powerdns | powerdns]]
   * [[intern:locales | locales]]
   * [[intern:redmine | redmine]]