From 92baa26f8e295e04a723ae4dc8b4b21dc6517034 Mon Sep 17 00:00:00 2001 From: jrd Date: Sun, 28 May 2023 10:30:06 -0700 Subject: [PATCH 1/6] trivial change --- robots.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/robots.txt b/robots.txt index b5b598efa..601fa593f 100644 --- a/robots.txt +++ b/robots.txt @@ -2,3 +2,4 @@ User-agent: * Allow: / Sitemap: https://jamulus.io/sitemap.xml + From e240f474c552503d0e1ce5704bc7a76c63135c57 Mon Sep 17 00:00:00 2001 From: jrd Date: Sun, 28 May 2023 10:32:20 -0700 Subject: [PATCH 2/6] roll back --- robots.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/robots.txt b/robots.txt index 601fa593f..b5b598efa 100644 --- a/robots.txt +++ b/robots.txt @@ -2,4 +2,3 @@ User-agent: * Allow: / Sitemap: https://jamulus.io/sitemap.xml - From c2a80a2a04709f849df9040a67397bd2a65e118e Mon Sep 17 00:00:00 2001 From: jrd Date: Sun, 28 May 2023 11:18:16 -0700 Subject: [PATCH 3/6] tip off to why a path appears --- wiki/en/Running-a-Server.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index bd15535b4..18274ccdc 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -172,6 +172,7 @@ Show an agreement window before users can connect. The text of the agreement to ##### `-w or --welcomemessage` A "welcome message" to display in the Client chat window on connect. Can be given as a string or filename, and can contain HTML. +When a path is used, the full path must be accessible by the `jamulus` Linux user. If not accessible, the literal path (rather than its contents) will appear. ##### `--serverpublicip` The public IP address of the Server if connecting to a Directory behind the same NAT. See [the Directories guide](Directories) for further information. From 96d499b532cbad80791337846f3035d9f6bfee75 Mon Sep 17 00:00:00 2001 From: John Dempsey <1750243+mcfnord@users.noreply.github.com> Date: Tue, 30 May 2023 17:11:26 -0700 Subject: [PATCH 4/6] Apply suggestions from code review --- wiki/en/Running-a-Server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index 18274ccdc..65e024ba8 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -172,7 +172,7 @@ Show an agreement window before users can connect. The text of the agreement to ##### `-w or --welcomemessage` A "welcome message" to display in the Client chat window on connect. Can be given as a string or filename, and can contain HTML. -When a path is used, the full path must be accessible by the `jamulus` Linux user. If not accessible, the literal path (rather than its contents) will appear. +When a path is used, the file must be accessible by the user account running Jamulus. (On Linux and Mac, user `jamulus` is used by default.) If not accessible, the literal path (rather than its contents) will appear. ##### `--serverpublicip` The public IP address of the Server if connecting to a Directory behind the same NAT. See [the Directories guide](Directories) for further information. From 7107cee11b4a8cfdef51197bbabcac0f6eb07f14 Mon Sep 17 00:00:00 2001 From: John Dempsey <1750243+mcfnord@users.noreply.github.com> Date: Wed, 31 May 2023 11:37:25 -0700 Subject: [PATCH 5/6] Apply suggestions from code review --- wiki/en/Running-a-Server.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index 65e024ba8..a614644db 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -172,7 +172,7 @@ Show an agreement window before users can connect. The text of the agreement to ##### `-w or --welcomemessage` A "welcome message" to display in the Client chat window on connect. Can be given as a string or filename, and can contain HTML. -When a path is used, the file must be accessible by the user account running Jamulus. (On Linux and Mac, user `jamulus` is used by default.) If not accessible, the literal path (rather than its contents) will appear. +When a path is used, the file must be accessible by the user account running Jamulus. (On most Linux installations, user `jamulus` is used by default.) If not accessible, the literal path (rather than its contents) will appear. ##### `--serverpublicip` The public IP address of the Server if connecting to a Directory behind the same NAT. See [the Directories guide](Directories) for further information. From 0e6787a13b919c24f7d393e3d16eaa7bec0d2b9a Mon Sep 17 00:00:00 2001 From: jrd Date: Sun, 28 May 2023 10:30:06 -0700 Subject: [PATCH 6/6] alert to file location options roll back tip off to why a path appears Apply suggestions from code review Apply suggestions from code review --- wiki/en/Running-a-Server.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index bd15535b4..a614644db 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -172,6 +172,7 @@ Show an agreement window before users can connect. The text of the agreement to ##### `-w or --welcomemessage` A "welcome message" to display in the Client chat window on connect. Can be given as a string or filename, and can contain HTML. +When a path is used, the file must be accessible by the user account running Jamulus. (On most Linux installations, user `jamulus` is used by default.) If not accessible, the literal path (rather than its contents) will appear. ##### `--serverpublicip` The public IP address of the Server if connecting to a Directory behind the same NAT. See [the Directories guide](Directories) for further information.