Re-licensed
This commit is contained in:
parent
3d5f0d22c1
commit
3d66d22d91
3 changed files with 46 additions and 17 deletions
35
LICENSE
35
LICENSE
|
@ -1,21 +1,22 @@
|
||||||
MIT License
|
Copyright (C) 2020 James Mills
|
||||||
|
|
||||||
Copyright (c) 2019 davy wybiral
|
tube is covered by the MIT license::
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
obtaining a copy of this software and associated documentation
|
||||||
in the Software without restriction, including without limitation the rights
|
files (the "Software"), to deal in the Software without restriction,
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
including without limitation the rights to use, copy, modify, merge,
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
publish, distribute, sublicense, and/or sell copies of the Software,
|
||||||
furnished to do so, subject to the following conditions:
|
and to permit persons to whom the Software is furnished to do so,
|
||||||
|
subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included
|
||||||
copies or substantial portions of the Software.
|
in all copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
|
||||||
SOFTWARE.
|
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
21
LICENSE.old
Normal file
21
LICENSE.old
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
MIT License
|
||||||
|
|
||||||
|
Copyright (c) 2019 davy wybiral
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
|
@ -34,3 +34,10 @@ By default the server is configured to run on 127.0.0.1:0 which will assign a ra
|
||||||
4. `go run main.go` (this will output the URL for accessing from a browser)
|
4. `go run main.go` (this will output the URL for accessing from a browser)
|
||||||
5. Move videos to `$GOPATH/src/github.com/wybiral/tube/videos`
|
5. Move videos to `$GOPATH/src/github.com/wybiral/tube/videos`
|
||||||
6. Open the URL from step 4 and enjoy!
|
6. Open the URL from step 4 and enjoy!
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
tube source code is available under the MIT [License](/LICENSE).
|
||||||
|
|
||||||
|
Previously based off of [tube](https://github.com/wybiral/tube) by [davy wybiral
|
||||||
|
](https://github.com/wybiral). (See [LICENSE.old](/LICENSE.old))
|
||||||
|
|
Loading…
Reference in a new issue