From c24ecef879deb91a19d7ceedcb991eafbebc609d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sun, 28 Jun 2020 09:22:31 +0200 Subject: [PATCH] pending changes --- doc/docker/fpm/build.sh | 1 - doc/docker/nginx.conf | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/docker/fpm/build.sh b/doc/docker/fpm/build.sh index 97270a2607..d66a112e7e 100755 --- a/doc/docker/fpm/build.sh +++ b/doc/docker/fpm/build.sh @@ -7,7 +7,6 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//') [ $VERSION = $BRANCH ] && VERSION="$BRANCH.x-dev" [ $VERSION = "$DEFAULT.x-dev" ] && { - cd $(dirname $0) grep self.version composer.json | while read pack version; do composer update $(echo $pack|cut -d'"' -f2); done git status composer.lock|grep composer.lock && { git stash; git pull --rebase; git stash pop diff --git a/doc/docker/nginx.conf b/doc/docker/nginx.conf index 4207eabdd8..be802d0c49 100644 --- a/doc/docker/nginx.conf +++ b/doc/docker/nginx.conf @@ -80,6 +80,11 @@ server { proxy_pass http://push:9501; } + # SmallParT videos + location /egroupware/smallpart/Resources/Videos { + alias /var/lib/egroupware/default/files/smallpart; + } + # PHP in docroot #location ~ \.php { # fastcgi_pass fpm;