From eb91f5c1951aeb85bf71c338c480665f009e99bf Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 12:07:55 +0100 Subject: [PATCH 1/7] Update init-and-run-wiki --- init-and-run-wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-and-run-wiki b/init-and-run-wiki index b43bf23..b0a791d 100755 --- a/init-and-run-wiki +++ b/init-and-run-wiki @@ -5,4 +5,4 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then tiddlywiki mywiki --init server fi -exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html user "" 0.0.0.0 +exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html $USERNAME $PASSWORD 0.0.0.0 From 1c4072cf2830a5c4f2297991bbb7e5f339103438 Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 12:15:35 +0100 Subject: [PATCH 2/7] build --- init-and-run-wiki | 1 + 1 file changed, 1 insertion(+) diff --git a/init-and-run-wiki b/init-and-run-wiki index b0a791d..d20ded4 100755 --- a/init-and-run-wiki +++ b/init-and-run-wiki @@ -6,3 +6,4 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then fi exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html $USERNAME $PASSWORD 0.0.0.0 + From 53876d5921f6978943d470113857d05c97809b64 Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 12:36:53 +0100 Subject: [PATCH 3/7] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e0b4d37..f6bb1b6 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,7 @@ to lose sight of that, I recommend using a local folder for the volume. sudo docker run -d -p 8080:8080 -v $(pwd)/.tiddlywiki:/var/lib/tiddlywiki mazzolino/tiddlywiki In this example, the folder `$(pwd)/.tiddlywiki` is used for the data. + +# Auth + +Simply provide the USERNAME and PASSWORD env variables to enable authentication. From 70faf8684f65be5b9e0c72e54ca4c3e5adaa1997 Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 12:37:28 +0100 Subject: [PATCH 4/7] remove IP Defaults to 0.0.0.0 anyway, and this way auth can be empty and not error --- init-and-run-wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-and-run-wiki b/init-and-run-wiki index d20ded4..df44a07 100755 --- a/init-and-run-wiki +++ b/init-and-run-wiki @@ -5,5 +5,5 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then tiddlywiki mywiki --init server fi -exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html $USERNAME $PASSWORD 0.0.0.0 +exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html $USERNAME $PASSWORD From 7e51c7df1cf20e108cdf8e03406b2d882a79f6b0 Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 12:42:50 +0100 Subject: [PATCH 5/7] fix for when auth is not supplied --- init-and-run-wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-and-run-wiki b/init-and-run-wiki index df44a07..70fe54a 100755 --- a/init-and-run-wiki +++ b/init-and-run-wiki @@ -5,5 +5,5 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then tiddlywiki mywiki --init server fi -exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html $USERNAME $PASSWORD +exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-"''"} 0.0.0.0 From 2a8cc8f39e1ea6dee33fa50fe95036fd7fa432da Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 14:24:51 +0100 Subject: [PATCH 6/7] default user and pass --- init-and-run-wiki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-and-run-wiki b/init-and-run-wiki index 70fe54a..6d53175 100755 --- a/init-and-run-wiki +++ b/init-and-run-wiki @@ -5,5 +5,5 @@ if [ ! -d /var/lib/tiddlywiki/mywiki ]; then tiddlywiki mywiki --init server fi -exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-"''"} 0.0.0.0 +exec tiddlywiki mywiki --server 8080 $:/core/save/all text/plain text/html ${USERNAME:-user} ${PASSWORD:-'wiki'} 0.0.0.0 From d3e3bec240e6344f646e27171a7d91a765237c03 Mon Sep 17 00:00:00 2001 From: Tristram Oaten Date: Mon, 10 Oct 2016 14:30:24 +0100 Subject: [PATCH 7/7] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f6bb1b6..96398be 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,6 @@ In this example, the folder `$(pwd)/.tiddlywiki` is used for the data. # Auth -Simply provide the USERNAME and PASSWORD env variables to enable authentication. +Default auth is `user` / `wiki` + +Simply provide the USERNAME and PASSWORD env variables to customise.