Merge pull request #1 from monnierant/test

Test
pull/27/head
Monnier Antoine 2018-08-23 10:16:13 +02:00 committed by GitHub
commit 4c8df63f6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions

View File

@ -44,7 +44,6 @@ Flarum is the next-generation forum software that makes online discussion fun. I
| **PHP_MEMORY_LIMIT** | PHP memory limit | *optional* | 128M |
| **OPCACHE_MEMORY_LIMIT** | OPcache memory size in megabytes | *optional* | 128
| **LOG_TO_STDOUT** | Enable nginx and php error logs to stdout | *optional* | false
| **DO_CHMOD** | Enable or Disable chmod of files to $UID:$GUID | *optional* | true
## Installation

View File

@ -31,9 +31,15 @@ sed -i "s/<PHP_MEMORY_LIMIT>/$PHP_MEMORY_LIMIT/g" /etc/php7/php-fpm.conf
sed -i "s/<OPCACHE_MEMORY_LIMIT>/$OPCACHE_MEMORY_LIMIT/g" /etc/php7/conf.d/00_opcache.ini
# Set permissions
if [ "$DO_CHMOD" = true ]; then
chown -R $UID:$GID /flarum /services /var/log /var/lib/nginx
fi
find /flarum ! -user $UID -print0 | xargs -0 -r chown $UID:$GID
find /services ! -user $UID -print0 | xargs -0 -r chown $UID:$GID
find /var/log ! -user $UID -print0 | xargs -0 -r chown $UID:$GID
find /var/lib/nginx ! -user $UID -print0 | xargs -0 -r chown $UID:$GID
find /flarum ! -group $GID -print0 | xargs -0 -r chown $UID:$GID
find /services ! -group $GID -print0 | xargs -0 -r chown $UID:$GID
find /var/log ! -group $GID -print0 | xargs -0 -r chown $UID:$GID
find /var/lib/nginx ! -group $GID -print0 | xargs -0 -r chown $UID:$GID
cd /flarum/app
@ -109,9 +115,10 @@ else
fi
# Set permissions
if [ "$DO_CHMOD" = true ]; then
chown -R $UID:$GID /flarum
fi
find /flarum ! -user $UID -print0 | xargs -0 -r chown $UID:$GID
find /flarum ! -group $GID -print0 | xargs -0 -r chown $UID:$GID
# RUN !
exec su-exec $UID:$GID /bin/s6-svscan /services