CRICS/streamupload
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistent paths for downloaded binaries

Browse Source
This commit is contained in:
gitlab.com/pepa65 2022-09-17 00:11:11 +07:00
parent 73fbcb0508
commit a8b0536b3f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -11,9 +11,9 @@
FROM alpine:latest FROM alpine:latest
MAINTAINER "gitlab.com/pepa65 <pepa65@passchier.net>" MAINTAINER "gitlab.com/pepa65 <pepa65@passchier.net>"
RUN apk update && apk add bash php php-fpm ffmpeg tzdata file RUN apk update && apk add bash php php-fpm ffmpeg tzdata file
ADD https://good4.eu/mailer /usr/bin/mailer ADD https://good4.eu/mailer /usr/local/bin/mailer
#ADD https://caddyserver.com/api/download?os=linux&arch=amd64&idempotency=74472262832423 /usr/bin/caddy #ADD https://caddyserver.com/api/download?os=linux&arch=amd64&idempotency=74472262832423 /usr/bin/caddy
ADD https://good4.eu/caddy /usr/bin/caddy ADD https://good4.eu/caddy /usr/local/bin/caddy
COPY Caddyfile Dockerfile /root/ COPY Caddyfile Dockerfile /root/
WORKDIR /var/www WORKDIR /var/www
COPY encode init stream vars mailhash ./ COPY encode init stream vars mailhash ./

4
README.md
View File

@ -59,14 +59,14 @@ Make the config file `/root/Caddyfile` like:
#!/usr/bin/env bash #!/usr/bin/env bash
# Make sure internet is reachable # Make sure internet is reachable
while ! /usr/bin/ping -q -c 1 1.1.1.1 &>/dev/null while ! ping -q -c 1 1.1.1.1 &>/dev/null
do sleep 1 do sleep 1
done done
cd /root cd /root
/usr/local/bin/caddy stop &>/dev/null /usr/local/bin/caddy stop &>/dev/null
sleep 1 sleep 1
/usr/bin/killall -9 caddy &>/dev/null killall -9 caddy &>/dev/null
/usr/local/bin/caddy start &>/root/caddy.log /usr/local/bin/caddy start &>/root/caddy.log
``` ```
and make it executable: `chmod +x /root/Caddy`. and make it executable: `chmod +x /root/Caddy`.

2
encode
View File

@ -38,7 +38,7 @@ Mail(){ # 1:kind(0:done, 1:wrong type, 2:encoding error) 2:logline I:repopath,em
msg[2]="Heya,\n\nThe file '$name' started encoding on $start but ran into an error on $finish.\n\nStream Upload server\n" msg[2]="Heya,\n\nThe file '$name' started encoding on $start but ran into an error on $finish.\n\nStream Upload server\n"
if [[ $to && $user && $password && $smtp && $port ]] if [[ $to && $user && $password && $smtp && $port ]]
then # All ingredients for a mail present then # All ingredients for a mail present
mailer -m "$(echo -e "${msg[$1]}")" -t "$to" -s "${sbj[$1]}" -u "$user" -p "$password" -S "$smtp" -P "$port" -f "$from" 2>"$repopath/mailer.log" && /usr/local/bin/mailer -m "$(echo -e "${msg[$1]}")" -t "$to" -s "${sbj[$1]}" -u "$user" -p "$password" -S "$smtp" -P "$port" -f "$from" 2>"$repopath/mailer.log" &&
Log "== Mail with subject '${sbj[$1]}' sent to $to" || Log "== Mail with subject '${sbj[$1]}' sent to $to" ||
Log "== Mail with subject '${sbj[$1]}' failed to send to: $to" Log "== Mail with subject '${sbj[$1]}' failed to send to: $to"
Log "Start encoding on $start, finished on $finish" Log "Start encoding on $start, finished on $finish"

4
init
View File

@ -20,9 +20,9 @@ sed -i "s/%sslmail%/$sslmail/" /root/Caddyfile
[[ $interface ]] || interface=:80 [[ $interface ]] || interface=:80
sed -i "s/%interface%/$interface/" /root/Caddyfile sed -i "s/%interface%/$interface/" /root/Caddyfile
chmod +x /usr/bin/caddy /usr/bin/mailer chmod +x /usr/local/bin/caddy /usr/local/bin/mailer
php-fpm8 -R php-fpm8 -R
caddy start --config /root/Caddyfile --adapter caddyfile >caddy.log /usr/local/bin/caddy start --config /root/Caddyfile --adapter caddyfile >caddy.log
sleep 9999d sleep 9999d