From 9785ad108e43316df39e65dd7573e5254a42fa75 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:05:53 +0000 Subject: [PATCH 01/26] Delete server-window-options.inc --- assets/img/en-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/en-screenshots/server-window-options.inc diff --git a/assets/img/en-screenshots/server-window-options.inc b/assets/img/en-screenshots/server-window-options.inc deleted file mode 100644 index 2536b94a6..000000000 --- a/assets/img/en-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142687-da256fa5-d7b8-47ab-9265-63c3c9760841.png From fd770ab851eef06dd03092e9e258f0601b9ce3fd Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:06:45 +0000 Subject: [PATCH 02/26] Delete server-window-setup.inc --- assets/img/en-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/en-screenshots/server-window-setup.inc diff --git a/assets/img/en-screenshots/server-window-setup.inc b/assets/img/en-screenshots/server-window-setup.inc deleted file mode 100644 index 714fbf90e..000000000 --- a/assets/img/en-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142684-1b85e654-78be-4909-a76c-945d7a0f7ccc.png From 5e13c59df8a8c70d87a330da1b7c443e7584ad7e Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:08:39 +0000 Subject: [PATCH 03/26] Remove include --- wiki/en/Command-Line-Options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/Command-Line-Options.md b/wiki/en/Command-Line-Options.md index 4a652aa30..89b3d3dd3 100644 --- a/wiki/en/Command-Line-Options.md +++ b/wiki/en/Command-Line-Options.md @@ -17,5 +17,5 @@ permalink: "/wiki/Command-Line-Options" ## Server only commands -{% include_relative Include-Server-Commands.md %} +See [Running a Server](Running-a-Server#server-mode-options) From 8cfeb8987c2e2c405fe4c95c9e865f775d741e04 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:09:16 +0000 Subject: [PATCH 04/26] Delete Include-Server-Commands.md --- wiki/en/Include-Server-Commands.md | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 wiki/en/Include-Server-Commands.md diff --git a/wiki/en/Include-Server-Commands.md b/wiki/en/Include-Server-Commands.md deleted file mode 100644 index f76181a18..000000000 --- a/wiki/en/Include-Server-Commands.md +++ /dev/null @@ -1,19 +0,0 @@ -- `-d` or `--discononquit` Disconnect all Clients on quit. Normally, when a Server is stopped or restarted, any Clients that have not used their "Disconnect" buttons will re-establish connection when the Server comes back up again. Using this option forces Clients to manually re-establish their connections to the Server. -- `-e` or `--directoryserver` Register the Server on a Directory (e.g. to set its genre (see also `-o`)). See [Server Types](Running-a-Server#server-types) for further information. -- `--directoryfile` Remember registered Servers even if the Directory is restarted. Directory Servers only. See [this guide](Directories) for further information. -- `-f` or `--listfilter` Whitelist Servers registering on the Server list, format `ip address 1[;ip address 2]` Directories only. -- `-F` or `--fastupdate` Reduces latency if Clients connect with "Enable Small Network Buffers" option. Requires faster CPU to avoid dropouts, and more bandwidth to enabled Clients. -- `-l` or `--log` Enable logging, set path and file name -- `-L` or `--licence` Show an agreement window before users can connect -- `-m` or `--htmlstatus` Enable HTML status file, set path and file name -- `-o` or `--serverinfo` Location details in the format: `[name];[city];[country as two-letter ISO country code or Qt5 Locale]` (see [two-letter ISO country codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) or [Qt5 Locale values](https://doc.qt.io/qt-5/qlocale.html#Country-enum)) Registered Servers only -- `-P` or `--delaypan` Start with delay panning enabled See [notes](Running-a-Server#delay-panning) -- `-R` or `--recording` Set server recording directory; Server will record when a session is active by default. See [Options](Running-a-Server#options). -- `--norecord` Set server not to record by default (when recording is configured e.g via `-R`) -- `-s` or `--server` Start in Server mode -- `--serverbindip` Specify the IP address to bind to -- `-T` or `--multithreading` Use multithreading to make better use of multi-core CPUs to support more Clients -- `-u` or `--numchannels` Maximum number of channels (Clients) -- `-w` or `--welcomemessage` Welcome message on connect. Can be given as a string or filename, and can contain HTML. -- `-z` or `--startminimized` Start minimized -- `--serverpublicip` The public IP address of the Server if connecting to a Directory behind the same NAT. See [Notes on Directories](Directories#points-to-note-about-directories) From fae4a6d65e678b4281e0a180d05806418bf36337 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:10:57 +0000 Subject: [PATCH 05/26] Update Running-a-Server.md --- wiki/en/Running-a-Server.md | 320 +++++++++++++++++++----------------- 1 file changed, 167 insertions(+), 153 deletions(-) diff --git a/wiki/en/Running-a-Server.md b/wiki/en/Running-a-Server.md index b022821de..20ad5ef10 100644 --- a/wiki/en/Running-a-Server.md +++ b/wiki/en/Running-a-Server.md @@ -17,14 +17,15 @@ permalink: "/wiki/Running-a-Server" - ## Do I need to run a Server? -**No**. You can use the Servers listed by the built in Directories and use Jamulus without running a Server or choose a third party hosting service. If you just want an undisturbed session, use the [soloing technique described on the Tips and Tricks page](Tips-Tricks-More#have-an-undisturbed-session-on-any-server). If you decide you cannot use any of the Servers listed by the built in Directories, you may be able to use a Server (either Registered in a Custom Directory, or Unregistered - see [Server Types](#server-types)) hosted by a third party. Doing so will save you the trouble of setting one up yourself. +**No**. You don't need to run a Server. You can use the Servers listed by the built-in Directories and use Jamulus without running a Server yourself. You can also use an unlisted server if you know its internet address. Or you can use a third party hosting service such as [melomax](https://melomax.live/jamulus-hosting/) or [KOORD](https://koord.live/). There's probably a Server nearby that you and your friends can use at low enough latency for most needs. + +Using a public server might introduce you to strangers. If you want an undisturbed session, you can use the soloing technique described on the [Tips and Tricks page](Tips-Tricks-More#have-an-undisturbed-session-on-any-server). You won't hear strangers who connect to the Server, but they can hear you if they wish. -## Basic requirements +--- -While setting up a Server isn't difficult, it's a good idea to read the following background information to avoid some problems: +## Requirements ### Speed and latency @@ -36,86 +37,108 @@ However, various problems can also arise when setting up Servers - especially wh Consider using a cloud host, not your home internet connection, to get better ping times if you're having problems. - ### General notes * Any Server should have at least 1.6GHz CPU frequency and 1GB RAM * Running a Server may require you to adjust any firewalls running on or outside of your machine or cloud host. -* Running an Unregistered Server at home will require you to [port forward](#port-forwarding) on your router. When running a Registered Server, port forwarding should not be necessary in most cases, but it's advisable to do so because some networks may not work properly with Jamulus in its default mode. -* Jamulus only has limited IPv6 support which needs to be enabled with a command line argument on the Client and Server. (There are plans to expand IPv6 support.) +* You must set up port forwarding on your router to run an [Unregistered Server](Unregistered-Servers) at home. This should not be necessary when running a Registered Server in most cases. However, some home networks can require port forwarding for a Registered Server. +* Jamulus offers limited IPv6 support that you can turn on for a Client or Server from the command line. -## Server Types +--- -You can run your Server in different ways (either at home or on a 3rd party host): +## Installation -### 1. Registered +Most people run Jamulus on a 3rd party/cloud host as a "headless" Server (no video display or keyboard) on **hardware without audio** running Linux. You can also run a Server in a [**desktop environment**](#servers-on-the-desktop). -Your Server will be listed in a Directory. By default, Jamulus has a list of built-in Directories that Clients can connect to. If you register with one of these, anyone can then discover and connect to your Server. You can also have your Server listed on a Custom Directory, if that better meets your needs. +To run a headless server on Linux, the following steps assume you are familiar with the command line and Debian/Ubuntu or similar distribution that uses systemd. -
- Diagram of connections between Clients within a Jamulus Registered Server -
How Registered Servers work
-
+If you want to run a Server on a **Raspberry Pi** (or a different armhf/arm64 debian-based device), you will need to download the [latest armhf .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless-armhf }}) or [latest arm64 .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless-arm64 }}) depending on your CPU - not the default `amd64` ones for use on Intel/AMD machines. + +1. Download the [latest headless (amd64) .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless }}) (or for Raspberry Pi etc. as above) +1. Make sure you have a current list of standard packages: `sudo apt update` +1. Install the Jamulus package for your architecture, for example: + + `sudo apt install ./{{ site.download_file_names.deb-headless }}` + +1. Enable the headless Server process: + + `sudo systemctl enable jamulus-headless` + +1. Add your desired [command line options](Running-a-Server#configuration) to the `ExecStart` line in the systemd service file (by default you will be running an Unregistered Server): -### 2. Unregistered + `sudo systemctl edit --full jamulus-headless` -This is the default when starting a Server for the first time. Unregistered Servers are not listed by Directories, so only musicians who know your Server's address to will be able to connect to it. This is useful because Jamulus does not let you control who can connect to a Server. +1. Reload the systemd files and restart the headless Server: + + `sudo systemctl daemon-reload && systemctl restart jamulus-headless` + +_To upgrade your Server, just repeat the steps above._ + +_To amend your Server configuration, just repeat the last two steps above._ + +--- + +## Server Modes + +Servers can be run in one of three modes (either at home or on a 3rd party host), depending on your needs. + +### Unregistered mode + +This is the default when starting a Server for the first time. Unregistered Servers are not listed by Directories, so only musicians who know your Server's address can connect to it. + +**For information about running an Unregistered Server [see this guide](Unregistered-Servers).**
Diagram of connections between Clients within a Jamulus Unregistered Server -
How Unregistered Servers work
-If you are running an unregistered server behind a home internet connection, you might need to enable [port forwarding](#port-forwarding) as described below. +### Registered mode -### 3. Directory +In this mode your Server will appear in the server list supplied by a Directory. Jamulus Clients come with a list of Directories built-in. If you register your Server with one of these, anyone can discover and connect to it. -If you want to run a number of Servers, possibly also behind a firewall or on a LAN, you may want to run your Server as a Directory. Examples include online events, music associations, sectional rehearsals or music lessons for schools. +Alternatively, you can list your Server on a Custom Directory (see below). Clients will only find your Server if they enter the Custom Directory's internet address. + +Note that Directories can only register up to 150 Servers. If you see a message that says you cannot register your Server because the Directory is full, you can try registering with a different Directory. -To run a Directory [read this guide](Directories) +
+ Diagram of connections between Clients within a Jamulus Registered Server +
+### Directory mode -## Installation and Configuration +If you want to run a number of Servers, possibly also behind a firewall or on a LAN, you may want to run your Server as a Directory. Examples include online events, music associations, sectional rehearsals or music lessons for schools. -Most people run Jamulus as a "pure" Server on **hardware without audio** (e.g. on a 3rd party/cloud host) running Linux. The following steps assume you are familiar with the command line and Debian/Ubuntu or similar distribution using systemd. To run a server on Windows or on the desktop with a graphical user interface, [see this section](#servers-on-the-desktop). +For information, [see the Directories guide](Directories). -If you want to run a Server on a Raspberry Pi (or a different armhf/arm64 debian-based device), you will need to download the `.deb` files for 32 bit `armhf` or 64 bit `arm64`, not the default `amd64` ones you'd use on an Intel/AMD based machine. +--- +## Configuration options -### Installation +Depending on your operating system and how you are running the server, you can set Server options and make them persistent between reloads by following these steps: -1. Download the [latest headless (amd64) .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless }}) or, if you use a Raspberry Pi etc. download the [latest armhf .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless-armhf }}) or the [latest arm64 .deb file]({{ site.download_root_link }}{{ site.download_file_names.deb-headless-arm64 }}) -1. Update apt to make sure you have a current list of standard packages: `sudo apt update` -1. Install the Jamulus package: `sudo apt install ./{{ site.download_file_names.deb-headless }}` or for RasPi etc. armhf: `sudo apt install ./{{ site.download_file_names.deb-headless-armhf }}`; arm64: `sudo apt install ./{{ site.download_file_names.deb-headless-arm64 }}` -1. Enable the headless Server process via systemd: `sudo systemctl enable jamulus-headless` -1. Add your desired [command line options](Running-a-Server#command-line-options) to the `ExecStart` line in the systemd service file by running `sudo systemctl edit --full jamulus-headless` (By default you will be running an Unregistered Server). -1. Reload the systemd files `sudo systemctl daemon-reload` and restart the headless Server: `sudo systemctl restart jamulus-headless` -1. Check all is well with `systemctl status jamulus-headless` (hit `q` to get back to the command prompt). +**For Linux headless** (Debian/Ubuntu using systemd) -You can control Jamulus with the `systemctl` command. For example, to stop the Server cleanly: +Add your desired command line options to the `ExecStart` line in the systemd service file by running `sudo systemctl edit --full jamulus-headless` (You will need to reload or restart for the changes to take effect. See [Installation](#installation)) -`sudo systemctl stop jamulus-headless` +**For the GUI** (all platforms) -_To upgrade your Server, just repeat the steps above._ +Any settings made using the graphical interface will be stored in the `Jamulusserver.ini` file. (Do **not** edit this file by hand!) However, some options are not available in the GUI and need to be set using the command line. For more information, see [Servers on the desktop](#servers-on-the-desktop) -### Configuration +--- -#### Running in Registered mode +### Server mode-related options -The following minimum setup is required to [run a Registered Server](Running-a-Server#server-types): +##### `-e or --directoryserver` -~~~ -jamulus --nogui --server \ - --directoryserver genreServer:port \ - --serverinfo "yourServerName;yourCity;[country ID]" -~~~ +Required for a [Registered Server](Running-a-Server#2-registered). Also required to run Jamulus as a [Directory](Directories). -**Note**: Semicolon and newline characters are not allowed in `yourServerName` and `yourCity` within the `--serverinfo` argument +This option takes the format: -To register with one of the Directories built into the Jamulus Client, replace `genreServer:port` in the example above with one of the following options: +`--directoryserver hostname:port` where `hostname` is the Genre Directory host name and `port` is its port number. +To register with one of the Directories built into the Jamulus Client, replace `hostname:port` with one of the following options: -| Genre | Server Address | +| Genre | `hostname:port` | |-----------|------------------| |**Any Genre 1** |`anygenre1.jamulus.io:22124`| |**Any Genre 2** |`anygenre2.jamulus.io:22224`| @@ -125,185 +148,176 @@ To register with one of the Directories built into the Jamulus Client, replace ` |**Genre Classical/Folk** |`classical.jamulus.io:22524`| |**Genre Choral/Barbershop** |`choral.jamulus.io:22724`| -You can also specify a [Directory](#3-directory) in the same way from the command line, providing the Server Address in the same format. -#### Running as a Directory +##### `-o or --serverinfo` -If you wish to run a [Directory](Running-a-Server#3-directory) please see [this guide](Directories). +When registering your Server with a Directory, this lets you supply a server name and location details so that users can then search for these values from their Client. -### Maintenance +This option takes the format: -#### Viewing The Logs +`[name];[city];[country as two-letter ISO country code]` -Jamulus will log to the system log file if you left the `StandardOutput=journal` setting in the unit file. +See [two-letter ISO country codes](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements) -To view the log, use `journalctl` (to exit press Ctrl-C). For example, to read the system log file, filtered for the Jamulus service: +**Note:** Semicolon and newline characters are not allowed in `name` and `city` values. -`journalctl -f -u jamulus-headless` +##### `-L or --licence` +Show an agreement window before users can connect. The text of the agreement to be shown should be supplied as the `--welcomemessage` (see below). -#### Controlling Recording +##### `-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 using the recording function with the `-R` command line option, if the Server receives a SIGUSR1 signal during a recording, it will start a new recording in a new Directory. SIGUSR2 will recording enabled on/off. +##### `--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. -To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (e.g. `jamulusTogglerec.service`). +##### `--directoryfile` +_Directories only:_ Remember registered Servers even if the Directory is restarted. See [the Directories guide](Directories) for further information. -**Note:** You will need to save recordings to a path _outside_ of the jamulus home Directory, or remove `ProtectHome=true` from your systemd unit file (be aware that doing so is however a potential security risk). +##### `-f or --listfilter` +_Directories only:_ Allowlist Servers registering on the Server. See [the Directories guide](Directories) for further information. -For turning recording on or off (depending on the current state): +--- -~~~ - [Unit] - Description=Toggle recording state of Jamulus Server - Requisite=Jamulus-Server +### General Server options +These options can be used regardless of which mode your server is running in (although some may not be relevant for Directories). - [Service] - Type=oneshot - ExecStart=/bin/systemctl kill -s SIGUSR2 Jamulus-Server -~~~ +##### `-d or --discononquit` +Normally, when a Server is stopped or restarted, any Clients that have not pressed their **Disconnect** buttons will automatically re-establish the connection when the Server returns. This option forces Clients to manually re-establish their connections to the Server in this scenario. -For starting a new recording: +##### `-F or --fastupdate` +Reduces latency if Clients connect with **Enable Small Network Buffers** option. Requires faster CPU to avoid dropouts, and more bandwidth to enabled Clients. -~~~ - [Unit] - Description=Start a new recording on Jamulus Server - Requisite=Jamulus-Server +##### `-l or --log` +Enable logging, set path and file name - [Service] - Type=oneshot - ExecStart=/bin/systemctl kill -s SIGUSR1 Jamulus-Server -~~~ +##### `-m or --htmlstatus` +Enable HTML status file, set path and file name -_Note: The Jamulus service name in the `ExecStart` line needs to be the same as the `.service` file name you created when setting systemd to control your Jamulus Server. So in this example it would be `Jamulus-Server.service`_ +**Note:** This feature is deprecated, and may disappear in a future release. -Run `sudo systemctl daemon-reload` to register them for first use. +##### `-P or --delaypan` +Start with delay panning enabled. This option uses small differences in sound arrival time between the two ears. It produces a stereo effect similar to natural human hearing when compared to normal “volume” panning. -Now you can run these with the `systemctl` command, for example: +##### `-s` or `--server` +Start Jamulus in Server mode -`sudo systemctl start jamulusTogglerec` (assuming you named your unit file `jamulusTogglerec.service`) +##### `--serverbindip` +Specify the IP address the Jamulus process will bind to. -You can see the result of these commands if you run `systemctl status jamulus`, or by viewing the logs. +Normally, Jamulus will listen on all IP addresses on the host machine. Where the host has multiple network addresses, this option allows one of the addresses to be chosen. +##### `-T or --multithreading` +Use multithreading to make better use of multi-core CPUs. This setting may help the Server support more Clients. See also `--numchannels` -## Servers on the desktop +##### `-u or --numchannels` +Maximum number of channels (Clients) -Jamulus can be run in Server mode from the desktop. This gives you a graphical user interface to control most of the settings. +##### `-z or --startminimized` +Start the Jamulus Server graphical user interface in the minimized window state. -* **Windows users** - Use the "Jamulus Server" icon in the Windows Start menu. -* **macOS users** - Double-click the "Jamulus Server" icon in Applications (assuming you put the files from the install there as per [these instructions](Installation-for-Macintosh)). -* **Linux users** - Launch the "Jamulus Server" shortcut. Or you can open a terminal window (`CTRL+ALT+t` on Debian and related distros), type `jamulus -s` and hit return. +### Other options +{% include_relative Include-Shared-Commands.md %} -## Server Setup +--- -
Image of the Jamulus Server setup window
+## Recording -### The Directory list +##### `-R or --recording` +Set server recording directory. By default, the Server will record when a session is active. -**None**: By default, you will not be connected to a Directory and will be running in unregistered mode. [Read these instructions](#running-an-unregistered-server) to have other people connect to your Server in this mode. +**Note:** You will need to save recordings to a path _outside_ of the jamulus home directory, or remove `ProtectHome=true` from your systemd unit file, but be aware that doing could be a security risk. -**Genre**: To allow other people to see your Server on one of the Directories built into the Client, select your desired genre Directory. You should see a confirmation message saying whether your Server has registered successfully. If not, and you leave your Server running, it will keep trying to register until a free slot becomes available. +Recordings are per track in [Audacity](https://www.audacityteam.org/) `.lof` format and [REAPER](https://en.wikipedia.org/wiki/REAPER) `.rpp`. Open the respective files to listen to them in those applications. -**Custom**: This allows you to specify a custom directory on which to be listed. See the "Options" tab for the Custom Directory address you want to use. +**Note:** When your Server is recording, Clients display a red banner message that the session is being recorded. -To run your Server _as_ a Directory, you need to set the Custom Directory address as `localhost` or `127.0.0.1` and set the "Genre" to "Custom". [Read this guide](Directories) for further details. +##### `--norecord` +Set server not to record by default when recording is configured. -### My Server Info -When running as a Registered Server this displays the Server's name, city and country so that other users can easily identify it in the Directory listing. +### Controlling Recording -### Chat Welcome Message +Recording starts once the first person connects to the Server, and stops when the last person leaves. -The text entered here appears to all users when they join the Server (the chat window will open automatically for them). HTML is also supported. +If the Server receives a SIGUSR1 signal during a recording, it will start a new recording in a new directory. SIGUSR2 will toggle recording on/off. -## Options +To send these signals using systemd, create the following two `.service` files in `/etc/systemd/system`, calling them something appropriate (e.g. `jamulusTogglerec.service`). -
Image of Jamulus Server window options
+To turn recording on or off (depending on the current state): -### Recording Directory +~~~ + [Unit] + Description=Toggle recording state of Jamulus Server + Requisite=Jamulus-Server -This sets the path to where the Server's recordings will be stored. With this path set, the "Enable Jam Recorder" function in the Server Setup tab will make recording start once the first person connects to the Server, and stops when the last person leaves. Use the "New Recording" button to create a new sub-directory in which the recordings will be stored from then on. Note that Recordings are per track in [Audacity](https://www.audacityteam.org/) `.lof` format and [REAPER](https://en.wikipedia.org/wiki/REAPER) `.rpp`. Open the respective files to listen to them in those applications. + [Service] + Type=oneshot + ExecStart=/bin/systemctl kill -s SIGUSR2 Jamulus-Server +~~~ -**Note**: When your Server is recording, Clients will display a message that recording is on. +To start a new recording: -### Custom Directory Address +~~~ + [Unit] + Description=Start a new recording on Jamulus Server + Requisite=Jamulus-Server -Leave this field empty unless you need to list your Server on a [Custom Directory](#3-directory) or run a Directory. + [Service] + Type=oneshot + ExecStart=/bin/systemctl kill -s SIGUSR1 Jamulus-Server +~~~ -### Server List Filename +_Note: The Jamulus service name in the `ExecStart` line needs to be the same as the `.service` file name you created when setting systemd to control your Jamulus Server. So in this example it would be `Jamulus-Server.service`_ -Leave this field empty unless you need to run your Server as a [Directory](#3-directory). When in use, this holds the list of registered Servers whilst restarting the Directory. This prevents the server list appearing "empty" until the Servers re-register. +Run `sudo systemctl daemon-reload` to register them for first use. -### Delay panning +Now you can run these with the `systemctl` command, for example: -This option uses small differences in sound arrival time between the two ears. It produces a stereo effect similar to natural human hearing when compared to normal "volume" panning. +`sudo systemctl start jamulusTogglerec` -### Start Minimised +You can see the result of these commands if you run `systemctl status jamulus`, or by viewing the logs. -**Windows users** - If you want the Server to start automatically on system start, enable the corresponding check box. +--- -### Server status icon +## Servers on the desktop -When the Server is running, the operating system will show an icon in the system tray or status area to represent whether the Server is active: +Jamulus can run in Server mode in the graphical environment of a computer. This gives you a graphical user interface to control most of the settings. To do this, first [install Jamulus](Getting-Started) for your platform, the do one of the following: -
Image of the Jamulus Server icon
The Server is empty +* **Windows users** - Use the "Jamulus Server" icon in the Windows Start menu. If you want the Server to start automatically when you start Windows, check the box for this option. -
Image of the Jamulus Server icon
The Server is occupied +* **macOS users** - Double-click the "Jamulus Server" icon in Applications. -## Command line options +* **Linux users** - Launch the "Jamulus Server" shortcut. Or you can open a terminal window (`CTRL+ALT+t` on Debian and related distros), type `jamulus -s` and hit return. -Most common functions in Jamulus can be set using the GUI, but these and others can also be set using options given in a terminal window. Exactly how you do this will depend on your operating system. +While most common functions in Jamulus can be set using the GUI, others can only be set using options given in a terminal window when the server is launched. Exactly how you do this will depend on your operating system. -For example on Windows, to use a specific settings file, right-click on the Jamulus shortcut and choose "Properties" > Target. Add the necessary arguments to Jamulus.exe: +For example on Windows, to use a specific settings file, right-click on the Jamulus shortcut and choose **Properties** > **Target**. Add the necessary arguments to Jamulus.exe: -```shell - "C:\Program Files\Jamulus\Jamulus.exe" --serverbindip 192.168.0.100 -``` + `"C:\Program Files\Jamulus\Jamulus.exe" --serverbindip 192.168.0.100` For macOS, start a Terminal window and run Jamulus with the desired options like this: -```shell - /Applications/Jamulus.app/Contents/MacOS/Jamulus --serverbindip 192.168.0.100 -``` - -**Note**: Command line options will set the Server's defaults at startup. You can override them with their corresponding GUI controls while the Server is running. - -{% include_relative Include-Server-Commands.md %} - -{% include_relative Include-Shared-Commands.md %} - - -## Running an Unregistered Server - -It is highly recommended to test your Server by registering it on one of the built-in Directories **first** so as to narrow down any subsequent problems in unregistered mode. - -### Setting up a Server behind a home router - -If you set up your server at home, you will probably need to change some settings in your router/firewall: - -#### Port forwarding - -People from outside your home network will not be able to see things inside it. To let external Jamulus clients connect to your server, you need to set up port forwarding in your Router's settings. The exact setup differs for every router. For help see your Router's documentation or [portforward.com](https://portforward.com). + `/Applications/Jamulus.app/Contents/MacOS/Jamulus --serverbindip 192.168.0.100` -**Note:** The default port for the current version of Jamulus is **UDP** (not TCP) port **22124**. You will usually forward the port **22124** from outside your network to the port **22124** of the machine running the Server. +**Note** Command line options will set the Server’s defaults at startup. You can override them while the Server is running using their corresponding GUI controls. -**Note:** Your home router may change the IP address of the machine you're running your Server on. Depending on your router, you might need to give this machine a static IP address (often under DHCP settings of your router). +### The Server status icon -#### Getting the external IP - -To allow others to connect to your Server from the internet, get your external (WAN) IP address e.g. by [using Google](https://www.google.com/search?q=what+is+my+ip) and give it to them. -You yourself should connect using the local network (LAN) address of the machine the Server is running on. If you are running a Client on the same machine as your Server, that would be `localhost` or `127.0.0.1`. +When a Server is running in GUI mode, the operating system will show an icon in the system tray or status area that indicates whether the Server has connections: +
Image of the Jamulus Server icon
The Server is empty -#### Dynamic DNS and why you will probably need it +
Image of the Jamulus Server icon
The Server is occupied -Most domestic internet connections change their external IP address after a short period. To avoid problems with this, you might want to set up "dynamic DNS" to get a static (sub-)domain you can share with others. Please research how to do that for your specic set up. Your router might support some "dynamic DNS" providers out of the box. If this is not the case, set up a dynamic DNS client as described by the dynamic DNS provider you chose. +--- ## Backing up the Server -_Note that headless Servers do not use `.ini` files. All configuration is given as command line options._ - {% include_relative Include-Backing-Up.md %} +- Headless Servers do not use `.ini` files. All configuration is given as command line options. If you are running a server in GUI mode, after reading any command line options on start, it will store its configuration in the `Jamululsserver.ini` file. + ## Troubleshooting If you are having other problems, [see this guide](Server-Troubleshooting). From 834f26088e3399f240fcfcdcce82d2ed0fa07ebb Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:12:15 +0000 Subject: [PATCH 06/26] Add files via upload --- wiki/en/Unregistered-Servers.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 wiki/en/Unregistered-Servers.md diff --git a/wiki/en/Unregistered-Servers.md b/wiki/en/Unregistered-Servers.md new file mode 100644 index 000000000..a6b65f586 --- /dev/null +++ b/wiki/en/Unregistered-Servers.md @@ -0,0 +1,32 @@ +--- +layout: wiki +title: "Running an Unregistered Server" +lang: "en" +permalink: "/wiki/Unregistered-Servers" +--- + +{% include breadcrumb.html root="More" branch1="Server Administration" branch1-url="Running-a-Server" %} + +# Running an Unregistered Server + +It is highly recommended to test your Server by registering it on one of the built-in Directories **first**. This will help you tackle general problems before you try unregistered mode. + +## Setting up a Server behind a home router + +If you set up your server at home, you will probably need to change some settings in your router/firewall: + +### Port forwarding + +Normally, people from outside your home network cannot see things inside it. To let external Jamulus clients connect to your server, you need to set up port forwarding in your router's settings. The exact setup differs for every router. For help, see your router's documentation or [portforward.com](https://portforward.com). + +**Note:** The default port for Jamulus is **UDP** (not TCP) port **22124**. You will usually forward the port **22124** from outside your network to the port **22124** of the computer running the Server. + +### Getting the public IP + +To allow others to connect to your Server from the internet, give them your public internet IP address. You can [learn your current address using Google](https://www.google.com/search?q=what+is+my+ip). +You should connect yourself using the local network address of the computer the Server is running on. If you are running a Client on the same computer as your Server, the address is `localhost` or `127.0.0.1`. + + +### Dynamic DNS and why you will probably need it + +Unless your ISP provides you with a fixed IP address, you may find that your address changes over time. You might want to set up "dynamic DNS" to get a static address you can share with others. A "dynamic DNS" provider can supply you with a static IP address that you can share, but you need to keep refreshing your dynamic IP with the provider. Your router might support certain providers to do this. If this is not the case, the provider will have instructions on how to set up a dynamic DNS client. From 979e9e454036b1942776f8e36df69dcef723dd6b Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:15:34 +0000 Subject: [PATCH 07/26] Update navigation.yml --- wiki/en/misc/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/misc/navigation.yml b/wiki/en/misc/navigation.yml index 0df6c0849..b0605f399 100644 --- a/wiki/en/misc/navigation.yml +++ b/wiki/en/misc/navigation.yml @@ -18,7 +18,7 @@ nav: url: /wiki/Client-Troubleshooting - title: More subfolderitems: - - page: Server Administration + - page: Running a Server url: /wiki/Running-a-Server - page: Tips & Tricks url: /wiki/Tips-Tricks-More From 912a875aa92f2833bdadd8dce6467be0215a4dd5 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:31:36 +0000 Subject: [PATCH 08/26] Change nav label --- wiki/en/misc/navigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/en/misc/navigation.yml b/wiki/en/misc/navigation.yml index b0605f399..06c65d49e 100644 --- a/wiki/en/misc/navigation.yml +++ b/wiki/en/misc/navigation.yml @@ -18,7 +18,7 @@ nav: url: /wiki/Client-Troubleshooting - title: More subfolderitems: - - page: Running a Server + - page: Server Manual url: /wiki/Running-a-Server - page: Tips & Tricks url: /wiki/Tips-Tricks-More From 76f1d3b81f75994d6241f6426f3d68f5903dacc4 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:53:44 +0000 Subject: [PATCH 09/26] Delete server-window-options.inc --- assets/img/de-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/de-screenshots/server-window-options.inc diff --git a/assets/img/de-screenshots/server-window-options.inc b/assets/img/de-screenshots/server-window-options.inc deleted file mode 100644 index 4c9e3f087..000000000 --- a/assets/img/de-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/150634900-fdd609d2-2105-44b0-a081-ba7a5fa1faa8.png From 16afde6cb66fd9e0ecac8e8748175f09cadbaee6 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:54:06 +0000 Subject: [PATCH 10/26] Delete server-window-setup.inc --- assets/img/de-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/de-screenshots/server-window-setup.inc diff --git a/assets/img/de-screenshots/server-window-setup.inc b/assets/img/de-screenshots/server-window-setup.inc deleted file mode 100644 index 720a0f35e..000000000 --- a/assets/img/de-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/150634883-e2788c8c-b7e0-4f32-9d4e-7bc7224e37b8.png From 57b73106cbb95255420f1fc36e22acf8eac37bf2 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:54:28 +0000 Subject: [PATCH 11/26] Delete server-window-options.inc --- assets/img/es-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/es-screenshots/server-window-options.inc diff --git a/assets/img/es-screenshots/server-window-options.inc b/assets/img/es-screenshots/server-window-options.inc deleted file mode 100644 index 5ec60de56..000000000 --- a/assets/img/es-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4263412/179260421-a85e25ea-34b5-4c20-9dca-ce23d3ec8a60.png From 64a3b06a62879e166be83648cb559469722a6231 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:54:37 +0000 Subject: [PATCH 12/26] Delete server-window-setup.inc --- assets/img/es-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/es-screenshots/server-window-setup.inc diff --git a/assets/img/es-screenshots/server-window-setup.inc b/assets/img/es-screenshots/server-window-setup.inc deleted file mode 100644 index 0c4996eae..000000000 --- a/assets/img/es-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4263412/179260333-df85d696-eede-4abd-8aa9-b042d8bf4036.png From 9cafdcbc7edfe9e63ab4b39c8d323abe290df180 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:56:19 +0000 Subject: [PATCH 13/26] Delete server-window-options.inc --- assets/img/fr-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/fr-screenshots/server-window-options.inc diff --git a/assets/img/fr-screenshots/server-window-options.inc b/assets/img/fr-screenshots/server-window-options.inc deleted file mode 100644 index 02447050a..000000000 --- a/assets/img/fr-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/12748768/179054398-8e659c23-3516-4489-8319-c3cf1ea68053.png \ No newline at end of file From b09d73de00636cf703a997f37f1a715fcc59c477 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:56:28 +0000 Subject: [PATCH 14/26] Delete server-window-setup.inc --- assets/img/fr-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/fr-screenshots/server-window-setup.inc diff --git a/assets/img/fr-screenshots/server-window-setup.inc b/assets/img/fr-screenshots/server-window-setup.inc deleted file mode 100644 index cb2d4a43e..000000000 --- a/assets/img/fr-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/12748768/179054052-da19298e-f3d5-440d-a560-4e502ada1544.png From 39c917cc440553f9b9d9271ea4d07c6c954539ff Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:56:43 +0000 Subject: [PATCH 15/26] Delete server-window-options.inc --- assets/img/ko_KR-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/ko_KR-screenshots/server-window-options.inc diff --git a/assets/img/ko_KR-screenshots/server-window-options.inc b/assets/img/ko_KR-screenshots/server-window-options.inc deleted file mode 100644 index 2536b94a6..000000000 --- a/assets/img/ko_KR-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142687-da256fa5-d7b8-47ab-9265-63c3c9760841.png From c519c1e71631980b565691802928ec2f56c798f2 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:56:50 +0000 Subject: [PATCH 16/26] Delete server-window-setup.inc --- assets/img/ko_KR-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/ko_KR-screenshots/server-window-setup.inc diff --git a/assets/img/ko_KR-screenshots/server-window-setup.inc b/assets/img/ko_KR-screenshots/server-window-setup.inc deleted file mode 100644 index 714fbf90e..000000000 --- a/assets/img/ko_KR-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142684-1b85e654-78be-4909-a76c-945d7a0f7ccc.png From d6660d218ad0db37c287d1f1dd193713ffca760e Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:57:02 +0000 Subject: [PATCH 17/26] Delete server-window-options.inc --- assets/img/nb_NO-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/nb_NO-screenshots/server-window-options.inc diff --git a/assets/img/nb_NO-screenshots/server-window-options.inc b/assets/img/nb_NO-screenshots/server-window-options.inc deleted file mode 100644 index 2536b94a6..000000000 --- a/assets/img/nb_NO-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142687-da256fa5-d7b8-47ab-9265-63c3c9760841.png From 47e483cee74ceb4a74226e6c636769b94e5058c7 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:57:09 +0000 Subject: [PATCH 18/26] Delete server-window-setup.inc --- assets/img/nb_NO-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/nb_NO-screenshots/server-window-setup.inc diff --git a/assets/img/nb_NO-screenshots/server-window-setup.inc b/assets/img/nb_NO-screenshots/server-window-setup.inc deleted file mode 100644 index 714fbf90e..000000000 --- a/assets/img/nb_NO-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142684-1b85e654-78be-4909-a76c-945d7a0f7ccc.png From bf54ba74350ed5a79d135c83d4c7ad6ae3558077 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:59:42 +0000 Subject: [PATCH 19/26] Delete server-window-options.inc --- assets/img/nl-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/nl-screenshots/server-window-options.inc diff --git a/assets/img/nl-screenshots/server-window-options.inc b/assets/img/nl-screenshots/server-window-options.inc deleted file mode 100644 index aa24132b5..000000000 --- a/assets/img/nl-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/13550012/178717403-9ad11b79-c09b-4176-84a1-d2def00121a5.png From d2dd0734fc832ed54704f52fa1410ca09ebc59b1 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 15:59:49 +0000 Subject: [PATCH 20/26] Delete server-window-setup.inc --- assets/img/nl-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/nl-screenshots/server-window-setup.inc diff --git a/assets/img/nl-screenshots/server-window-setup.inc b/assets/img/nl-screenshots/server-window-setup.inc deleted file mode 100644 index d60888357..000000000 --- a/assets/img/nl-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/13550012/178717359-6d949933-2d7c-4089-b487-bc1ff28ed54b.png From d33fc9c36e1042a52f0dce954e01b0a0fec8dadf Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:04 +0000 Subject: [PATCH 21/26] Delete server-window-options.inc --- assets/img/pt_BR-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/pt_BR-screenshots/server-window-options.inc diff --git a/assets/img/pt_BR-screenshots/server-window-options.inc b/assets/img/pt_BR-screenshots/server-window-options.inc deleted file mode 100644 index 2536b94a6..000000000 --- a/assets/img/pt_BR-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142687-da256fa5-d7b8-47ab-9265-63c3c9760841.png From a2be3646e5167734822aa7cb3eca3145945e6c9c Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:10 +0000 Subject: [PATCH 22/26] Delete server-window-setup.inc --- assets/img/pt_BR-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/pt_BR-screenshots/server-window-setup.inc diff --git a/assets/img/pt_BR-screenshots/server-window-setup.inc b/assets/img/pt_BR-screenshots/server-window-setup.inc deleted file mode 100644 index 714fbf90e..000000000 --- a/assets/img/pt_BR-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142684-1b85e654-78be-4909-a76c-945d7a0f7ccc.png From 77afc7bf340458a8adb628cebeaf688f5886a57d Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:27 +0000 Subject: [PATCH 23/26] Delete server-window-options.inc --- assets/img/pt_PT-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/pt_PT-screenshots/server-window-options.inc diff --git a/assets/img/pt_PT-screenshots/server-window-options.inc b/assets/img/pt_PT-screenshots/server-window-options.inc deleted file mode 100644 index d613c615b..000000000 --- a/assets/img/pt_PT-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/147943782-4ad94c4a-4067-4c60-b208-a0aa3992d307.png From 3dc86328fcb412bae94395636eb34bc360b4c38a Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:34 +0000 Subject: [PATCH 24/26] Delete server-window-setup.inc --- assets/img/pt_PT-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/pt_PT-screenshots/server-window-setup.inc diff --git a/assets/img/pt_PT-screenshots/server-window-setup.inc b/assets/img/pt_PT-screenshots/server-window-setup.inc deleted file mode 100644 index 68cad412f..000000000 --- a/assets/img/pt_PT-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/147943809-eb334ba1-1706-43a2-b34d-dca8c8def2cb.png From ce3cce4f39f72e0cee26215f93fe86889ebbaccd Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:46 +0000 Subject: [PATCH 25/26] Delete server-window-options.inc --- assets/img/zh_CN-screenshots/server-window-options.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/zh_CN-screenshots/server-window-options.inc diff --git a/assets/img/zh_CN-screenshots/server-window-options.inc b/assets/img/zh_CN-screenshots/server-window-options.inc deleted file mode 100644 index 2536b94a6..000000000 --- a/assets/img/zh_CN-screenshots/server-window-options.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142687-da256fa5-d7b8-47ab-9265-63c3c9760841.png From f4ad3619e34efbf55eb90f663133d28cc9ee5b01 Mon Sep 17 00:00:00 2001 From: Jonathan <4561747+gilgongo@users.noreply.github.com> Date: Tue, 3 Jan 2023 16:00:53 +0000 Subject: [PATCH 26/26] Delete server-window-setup.inc --- assets/img/zh_CN-screenshots/server-window-setup.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 assets/img/zh_CN-screenshots/server-window-setup.inc diff --git a/assets/img/zh_CN-screenshots/server-window-setup.inc b/assets/img/zh_CN-screenshots/server-window-setup.inc deleted file mode 100644 index 714fbf90e..000000000 --- a/assets/img/zh_CN-screenshots/server-window-setup.inc +++ /dev/null @@ -1 +0,0 @@ -https://user-images.githubusercontent.com/4561747/178142684-1b85e654-78be-4909-a76c-945d7a0f7ccc.png