From 93b80832851e540d6318cd08cbd88b3238dd3b05 Mon Sep 17 00:00:00 2001 From: "gitlab.com/pepa65" Date: Thu, 8 Sep 2022 09:40:56 +0700 Subject: [PATCH 1/2] Reorder readme --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7044726..9ad6437 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,6 @@ For php functionality, install `php-fpm` (on deb-based systems: ``` #!/usr/bin/env bash -### Docker -After cloning this repo and `cd streamupload`, a docker image can be built -from the included `Dockerfile` by: `docker build -t streamupload .`. -In the case of running on a LAN and not having a DNS A record, start it with: -`docker run -d -p 8080:80 -v $PWD/uploadpage:/var/www/uploadpage streamupload`. -In case of a domainname, replace `8080:80` by `443:443`. - # Make sure internet is reachable while ! /usr/bin/ping -q -c 1 1.1.1.1 &>/dev/null do sleep 1 @@ -76,6 +69,13 @@ sleep 1 ``` and make it executable: `chmod +x /root/Caddy`. +### Docker +After cloning this repo and `cd streamupload`, a docker image can be built +from the included `Dockerfile` by: `docker build -t streamupload .`. +In the case of running on a LAN and not having a DNS A record, start it with: +`docker run -d -p 8080:80 -v $PWD/uploadpage:/var/www/uploadpage streamupload`. +In case of a domainname, replace `8080:80` by `443:443`. + ## Usage * Get a streamkey for the target by scheduling a stream (supported are: Restream.io, YouTube.com, Facebook.com). From 3896ebe3927198de162cf79d2a00fe101a2edfd1 Mon Sep 17 00:00:00 2001 From: "gitlab.com/pepa65" Date: Thu, 8 Sep 2022 10:18:39 +0700 Subject: [PATCH 2/2] Use users --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9ad6437..1fa08e5 100644 --- a/README.md +++ b/README.md @@ -38,16 +38,21 @@ For php functionality, install `php-fpm` (on deb-based systems: basicauth { $user $hashpassword } + log { + output file /var/www/web.log + } php_fastcgi unix//run/php/php-fpm.sock + request_header +X-User {http.auth.user.id} root * $repopath/uploadpage file_server } ``` * If the server IP has an DNS A record pointing to it, `:80` can be replaced by the domainname with the A record. -* Replace `$user` with the desired username for authentication. -* Replace `$hashpassword` with the output of `caddy hash-password` which will - ask for the password to be used for authentication. +* Replace `$user` with the desired username for authentication and replace + `$hashpassword` with the output of `caddy hash-password` which will + ask for the password to be used for authentication. Multiple users (on + separate lines) are allowed. * Replace `$repopath` (see above in Install). * The value of `/run/php/php-fpm.sock` might need to be adjusted, depending on the system used, it needs to be the unix socket for php.