Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 30 commits into from
Aug 18, 2019
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
34b3663
initial merge of nginx and ipfs server into one instance
darkdrgn2k Mar 28, 2019
2b444bf
Corrected errors in tf
darkdrgn2k Mar 28, 2019
a2086c7
Update bootstrap.sh
darkdrgn2k Mar 28, 2019
26967cd
Update bootstrap-post-dns.sh
darkdrgn2k Mar 28, 2019
b845d43
Update nginx.conf
darkdrgn2k Mar 28, 2019
8b67eeb
Update nginx.conf
darkdrgn2k Mar 28, 2019
b5fbb7d
Updated nginx compile paramaters
darkdrgn2k Mar 28, 2019
78fc7b4
Merge branch 'nginx-hls' of https://github.com/tomeshnet/ipfs-live-st…
darkdrgn2k Mar 28, 2019
95b278a
Update nginx.conf
darkdrgn2k Mar 28, 2019
06e8ef5
Process stream updated for hls
darkdrgn2k Mar 28, 2019
2677674
Merge branch 'nginx-hls' of https://github.com/tomeshnet/ipfs-live-st…
darkdrgn2k Mar 28, 2019
d2a18e1
Fixed nginx and bootstrap things
darkdrgn2k Mar 29, 2019
d3c9acb
Updated process stream
darkdrgn2k Mar 29, 2019
5e6f8ad
Corrected bootstrap and process stream
darkdrgn2k Mar 29, 2019
16d05bd
Cleanup
darkdrgn2k Mar 29, 2019
c05b63d
Corrected syntax
darkdrgn2k Mar 29, 2019
c3d9f24
Cleanup
darkdrgn2k Mar 29, 2019
0211624
Syntax cleanup
darkdrgn2k Mar 29, 2019
22f3317
Merge branch 'nginx-hls' of https://github.com/tomeshnet/ipfs-live-st…
darkdrgn2k Mar 29, 2019
76ba2dc
Whitespace
darkdrgn2k Mar 29, 2019
2cccd4b
updated stream1 requirement
darkdrgn2k Aug 14, 2019
0dd2438
Syntax Update
darkdrgn2k Aug 15, 2019
186eeae
Delete Security
darkdrgn2k Aug 18, 2019
d7806a2
Update terraform/rtmp-server/bootstrap-post-dns.sh
darkdrgn2k Aug 18, 2019
1426b89
Update terraform/rtmp-server/bootstrap.sh
darkdrgn2k Aug 18, 2019
066a0e3
Update bootstrap.sh
darkdrgn2k Aug 18, 2019
61b44fc
Alphabetize apt-get
darkdrgn2k Aug 18, 2019
e340acc
Update terraform/rtmp-server/bootstrap-post-dns.sh
darkdrgn2k Aug 18, 2019
287aace
Reverted spacing
darkdrgn2k Aug 18, 2019
a61d6e1
removed duplicate line
darkdrgn2k Aug 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
darkdrgn2k marked this conversation as resolved.
Show resolved Hide resolved

To authenticate using Yggdrasil, start it with `yggdrasil.conf` and note the last line of
output like this:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions terraform/Security
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add the SSH key to your Digital Ocean account under Settings
darkdrgn2k marked this conversation as resolved.
Show resolved Hide resolved
105 changes: 0 additions & 105 deletions terraform/ipfs-server/bootstrap.sh

This file was deleted.

103 changes: 0 additions & 103 deletions terraform/ipfs-server/process-stream.sh

This file was deleted.

Loading