JJTC-Container-Images
/
bookstack-ppm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix format

This commit is contained in:
TBK 2019-07-31 23:49:33 +02:00
parent 7c5c83739d
commit 4e36278ada
No known key found for this signature in database
GPG Key ID: 5FFB25718720C7D7
3 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/docker-entrypoint.sh
View File

@ -16,7 +16,16 @@ echo "Starting Nginx:"
nginx nginx
echo "Getting PPM ready:" echo "Getting PPM ready:"
trapIt () { "$@"& pid="$!"; trap 'kill -INT $pid' INT TERM; while kill -0 $pid > /dev/null 2>&1; do wait $pid; ec="$?"; done; exit $ec;}; trapIt() {
"$@" &
pid="$!"
trap 'kill -INT $pid' INT TERM
while kill -0 $pid >/dev/null 2>&1; do
wait $pid
ec="$?"
done
exit $ec
}
echo "Starting PPM:" echo "Starting PPM:"
trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json

76
app/nginx.conf
View File

@ -3,52 +3,52 @@ pid /tmp/nginx.pid;
daemon on; daemon on;
events { events {
worker_connections 1024; worker_connections 1024;
} }
http { http {
## ##
# Basic Settings # Basic Settings
## ##
sendfile on; sendfile on;
tcp_nopush on; tcp_nopush on;
tcp_nodelay on; tcp_nodelay on;
keepalive_timeout 65; keepalive_timeout 65;
types_hash_max_size 2048; types_hash_max_size 2048;
server_tokens off; # Do not announce nginx's version to the world! server_tokens off; # Do not announce nginx's version to the world!
# server_names_hash_bucket_size 64; # server_names_hash_bucket_size 64;
# server_name_in_redirect off; # server_name_in_redirect off;
include /etc/nginx/mime.types; include /etc/nginx/mime.types;
default_type application/octet-stream; default_type application/octet-stream;
## ##
# Logging Settings # Logging Settings
## ##
access_log /var/log/nginx/access.log; access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log; error_log /var/log/nginx/error.log;
## ##
# Proxy Settings # Proxy Settings
## ##
proxy_buffering off; proxy_buffering off;
## ##
# Gzip Settings # Gzip Settings
## ##
gzip on; gzip on;
gzip_disable "msie6"; gzip_disable "msie6";
gzip_vary on; gzip_vary on;
gzip_proxied any; gzip_proxied any;
gzip_comp_level 6; gzip_comp_level 6;
gzip_buffers 16 8k; gzip_buffers 16 8k;
gzip_http_version 1.1; gzip_http_version 1.1;
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
## ##
# Virtual Host Configs # Virtual Host Configs
## ##
include /etc/nginx/sites-enabled/*; include /etc/nginx/sites-enabled/*;
} }

5
bookstack.sh
View File

@ -2,10 +2,8 @@
# Setup process # Setup process
# Check if .env exists # Check if .env exists
## if not create .env and start guided setup ## if not create .env and start guided setup
### Check dependencies e.g. openssl/libressl ### Check dependencies e.g. openssl/libressl
@ -14,6 +12,3 @@ openssl rand -base64 32
# Check is there is new version and offer to download # Check is there is new version and offer to download
## if .env exists but is and old version then Update and get user input ## if .env exists but is and old version then Update and get user input