Merge ipfs+rtmp server into one and drop FFMPEG (#76)

tomeshnet · Aug 18, 2019 · c51a4b8 · c51a4b8
1 parent dccc050
commit c51a4b8
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 296 deletions.
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ installed on your local machine, which can be the same device running OBS Studio
     To authenticate using OpenVPN, connect with your OpenVPN client using `client.conf` or
     `client.ovpn`, then publish your OBS Studio stream to:
 
-        rtmp://10.10.10.1:1935/live
+        rtmp://10.10.10.1:1935/live/stream1
 
     To authenticate using Yggdrasil, start it with `yggdrasil.conf` and note the last line of
     output like this:
@@ -213,7 +213,7 @@ installed on your local machine, which can be the same device running OBS Studio
 
     Then publish your OBS Studio stream to the IPv6:
 
-        rtmp://[203:4bb0:9ff1:2312:e7f3:b8c4:852:a8b1]:1935/live
+        rtmp://[203:4bb0:9ff1:2312:e7f3:b8c4:852:a8b1]:1935/live/stream1
 
 1. When your streaming session is done, you can stop OpenVPN or Yggdrasil and destroy the
     servers with:

diff --git a/terraform/ipfs-server/bootstrap.sh b/terraform/ipfs-server/bootstrap.sh
diff --git a/terraform/ipfs-server/process-stream.sh b/terraform/ipfs-server/process-stream.sh