Merge pull request #8 from jyusang/master

Configure server path prefix
This commit is contained in:
m0wer 2022-07-16 17:56:51 +02:00 committed by GitHub
commit 24beb3bc3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 6 deletions

View file

@ -11,4 +11,3 @@ ADD init-and-run-wiki /usr/local/bin/init-and-run-wiki
# Meta
CMD ["/usr/local/bin/init-and-run-wiki"]
EXPOSE 8080

View file

@ -56,3 +56,12 @@ If you are in a memory-constrained environment, you can provide the
Set the `DEBUG_LEVEL` environment variable to `debug`. For example by passing
`-e DEBUG_LEVEL=debug` option in `docker run`.
### Path prefix
Set the `PATH_PREFIX` environment variable to customize the path prefix for
serving TiddlyWiki. For example by passing `-e PATH_PREFIX=\wiki` option in
`docker run`. According to this [note][path-prefix-note], please remember to
configure the client as well.
[path-prefix-note]: https://tiddlywiki.com/static/Using%2520a%2520custom%2520path%2520prefix%2520with%2520the%2520client-server%2520edition.html

View file

@ -16,10 +16,16 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then
mkdir /var/lib/tiddlywiki/mywiki/tiddlers
fi
# Configure listen command, see https://tiddlywiki.com/static/ListenCommand.html
listen_params="host=0.0.0.0 port=8080"
listen_params="$listen_params debug-level=${DEBUG_LEVEL-none}"
if [ -n "$PATH_PREFIX" ]; then
listen_params="$listen_params path-prefix=$PATH_PREFIX"
fi
if [ -n "$USERNAME" ]; then
listen_params="$listen_params username=$USERNAME"
listen_params="$listen_params password=${PASSWORD-wiki}"
fi
# Start the tiddlywiki server
if [ -z "$USERNAME" ]; then
exec /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --listen host=0.0.0.0 port=8080 debug-level=${DEBUG_LEVEL-none};
else
exec /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --listen host=0.0.0.0 port=8080 username="$USERNAME" password="${PASSWORD-wiki}" debug-level=${DEBUG_LEVEL-none};
fi
exec /usr/bin/env node $NODEJS_V8_ARGS $tiddlywiki_script mywiki --listen $listen_params