Skip to content

Commit

Permalink
rename my-devices.net to remote.macchina.io
Browse files Browse the repository at this point in the history
  • Loading branch information
obiltschnig committed Nov 26, 2022
1 parent d7cd1fc commit 19c2214
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion WebTunnel/WebTunnelAgent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ This setting specifies the domain UUID which is used to associate the device wit
or user group. It can also be used to group devices. The value should be an all lower-case
UUID like `d5f6e710-49c9-4e21-9cd7-2ae0054c3f13`. How domains are assigned to devices
and users depends on the specific macchina.io REMOTE server instance. For example, the
[public test server](https://reflector.my-devices.net) assigns a unique domain UUID to
[public test server](https://reflector.remote.macchina.io) assigns a unique domain UUID to
each new registered user account.

Please note that it's not allowed to change the domain UUID of an already registered device
Expand Down
2 changes: 1 addition & 1 deletion WebTunnel/WebTunnelAgent/WebTunnelAgent.properties
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ webtunnel.https.enable = false
# If your WebTunnelAgent build does not support SSL/TLS,
# replace https with http. The connection between device
# and reflector server will not be secure in that case.
webtunnel.reflectorURI = https://reflector.my-devices.net
webtunnel.reflectorURI = https://remote.macchina.io

# The username of the device. Consists of device ID and
# domain UUID, separated by '@'. Should not be changed.
Expand Down
2 changes: 1 addition & 1 deletion WebTunnel/WebTunnelAgent/etc/init.d/WebTunnelAgent
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# X-Interactive: true
# Short-Description: Start/stop my-devices.net WebTunnelAgent
# Short-Description: Start/stop macchina.io REMOTE WebTunnelAgent
### END INIT INFO

. /lib/lsb/init-functions
Expand Down
8 changes: 4 additions & 4 deletions WebTunnel/WebTunnelClient/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-client`, you'll need to specify the URL of the remote device to connect
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net), as well as
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io), as well as
the remote port number - the port number on the device you want to connect to, and the
local port number - the port number on your machine that will be forwarded to the device's
remote port.
Expand All @@ -47,13 +47,13 @@ For example, to forward the SSH port (22) of an embedded Linux device to your lo
machine (port 2222), run:

```
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net -R 22 -L 2222
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io -R 22 -L 2222
```

If running on Windows, the parameters must be passed Windows-style:

```
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net /remote 22 /local 2222
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io /remote 22 /local 2222
```

`remote-client` will prompt for your macchina.io REMOTE username and password.
Expand All @@ -79,7 +79,7 @@ to specify the command. Arguments for the command can be specified at the end of
command-line, separated by `--`. Example:

```
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net -R 22 -L 2222 -C ssh -- -p 22 localhost
remote-client https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io -R 22 -L 2222 -C ssh -- -p 22 localhost
```

Given command to execute, `remote-client` will terminate as soon as the specified program has
Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelClient/src/WebTunnelClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ class WebTunnelClient: public Poco::Util::ServerApplication
"<Remote-URI> specifies the URI of the remote device via the\n"
"macchina.io REMOTE server, e.g.:\n"
#if defined(WEBTUNNEL_ENABLE_TLS)
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#else
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#endif
"\n\n"
"The following command-line options are supported:"s
Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelRDP/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-rdp`, you'll need to specify the URL of the remote device to connect
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net).
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io).

```
remote-rdp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-rdp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

`remote-rdp` will prompt for your macchina.io REMOTE username and password and
Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelRDP/src/WebTunnelRDP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ class WebTunnelRDP: public Poco::Util::Application
"<Remote-URI> specifies the URI of the remote device via the\n"
"macchina.io REMOTE server, e.g.:\n"
#if defined(WEBTUNNEL_ENABLE_TLS)
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#else
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#endif
"\n\n"
"The following command-line options are supported:"s
Expand Down
12 changes: 6 additions & 6 deletions WebTunnel/WebTunnelSCP/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-scp`, you'll need to specify the macchina.io REMOTE fully-qualified
host name of the remote device to connect to (e.g. 8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net),
host name of the remote device to connect to (e.g. 8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io),
as well as the SSH login to connect with.

To copy a file (`file.txt`) from the remote device (`8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net`)
To copy a file (`file.txt`) from the remote device (`8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io`)
to the local machine's current directory (`.`), using remote SSH login `pi`:
```
remote-scp pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net:file.txt .
remote-scp pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io:file.txt .
```

To copy a file (`file.txt`) from the local machine to the home directory on the remote device
(`8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net`), using remote SSH login `pi`:
(`8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io`), using remote SSH login `pi`:
```
remote-scp file.txt pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net:
remote-scp file.txt pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io:
```

`remote-scp` will prompt for your macchina.io REMOTE username and password, set-up
Expand All @@ -44,7 +44,7 @@ are given on the `remote-scp` command-line, separated with a `--`. For example,
a private key for authentication:

```
remote-scp -- -i ~/.ssh/mysecret pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net:file.txt .
remote-scp -- -i ~/.ssh/mysecret pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io:file.txt .
```

On Windows, the `--` is not required.
Expand Down
2 changes: 1 addition & 1 deletion WebTunnel/WebTunnelSCP/src/WebTunnelSCP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class WebTunnelSCP: public Poco::Util::Application
"connection to a remote host via the macchina.io REMOTE server.\n\n"
"A remote source or target is specified by using the macchina.io REMOTE\n"
"device hostname, in the form <user>@<hostname>:<file>, like with scp:\n"
"pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net:file.txt"
"pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io:file.txt"
"\n\n"
"The following command-line options are supported:"s
);
Expand Down
10 changes: 5 additions & 5 deletions WebTunnel/WebTunnelSFTP/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-sftp`, you'll need to specify the URL of the remote device to connect
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net), as well as the
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io), as well as the
user name to connect to.

```
remote-sftp -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-sftp -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

If running on Windows, the parameters must be passed Windows-style:

```
remote-sftp /l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-sftp /l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

It's also possible to specify remote username and the remote device address in a single
argument:

```
remote-sftp pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-sftp pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

On Windows, `remote-sftp` first looks for `sftp.exe`, which is available in newer
Expand All @@ -55,7 +55,7 @@ are given on the `remote-sftp` command-line, separated with a `--`. For example,
a private key for authentication:

```
remote-sftp -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net -- -i ~/.ssh/mysecret
remote-sftp -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io -- -i ~/.ssh/mysecret
```

On Windows, the `--` is not required.
Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelSFTP/src/WebTunnelSFTP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ class WebTunnelSFTP: public Poco::Util::Application
"<Remote-URI> specifies the URI of the remote device via the\n"
"macchina.io REMOTE server, e.g.:\n"
#if defined(WEBTUNNEL_ENABLE_TLS)
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#else
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#endif
"\n\n"
"The following command-line options are supported:"s
Expand Down
18 changes: 9 additions & 9 deletions WebTunnel/WebTunnelSSH/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-ssh`, you'll need to specify the URL of the remote device to connect
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net), as well as the
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io), as well as the
user name to connect to.

```
remote-ssh -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-ssh -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

If running on Windows, the parameters must be passed Windows-style:

```
remote-ssh /l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-ssh /l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

It is also possible to specify remote username and remote device address in one argument:

```
remote-ssh pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-ssh pi@8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

On Windows, `remote-ssh` first looks for `ssh.exe`, which is
Expand Down Expand Up @@ -81,13 +81,13 @@ client program which is a bit easier to use.
To copy a file `file.txt` to the remote system using `scp` with `remote-ssh`:

```
remote-ssh --scp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net file.txt pi@localhost:file.txt
remote-ssh --scp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io file.txt pi@localhost:file.txt
```

or, on Windows 10 (with SSH):

```
remote-ssh /scp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net file.txt pi@localhost:file.txt
remote-ssh /scp https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io file.txt pi@localhost:file.txt
```

Note that the remote host name must be specified as `localhost` in this case, as
Expand All @@ -101,7 +101,7 @@ are given on the `remote-ssh` command-line, separated with a `--`. For example,
a private key for authentication:

```
remote-ssh -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net -- -i ~/.ssh/mysecret
remote-ssh -l pi https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io -- -i ~/.ssh/mysecret
```

### Passing a Command or Script to the SSH Client
Expand All @@ -111,15 +111,15 @@ To do so, specify the command using the `--command` (short: `-m`; Windows: `/com
The given command will be passed to `ssh` after the extra options and the hostname:

```
remote-ssh -l pi -m "ls -l" https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-ssh -l pi -m "ls -l" https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

This can also be used to run a script (via pipe of redirection of stdin).
However, in this case, the macchina.io REMOTE username and password must be passed as
command-line arguments, and `bash` or another shell must be specified as command to execute via `ssh`:

```
remote-ssh -l pi -u rmuser -p rmpasswd -m bash https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net <script.sh
remote-ssh -l pi -u rmuser -p rmpasswd -m bash https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io <script.sh
```

### Command-Line Arguments Help
Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelSSH/src/WebTunnelSSH.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,9 @@ class WebTunnelSSH: public Poco::Util::Application
"<Remote-URI> specifies the URI of the remote device via the\n"
"macchina.io REMOTE server, e.g.:\n"
#if defined(WEBTUNNEL_ENABLE_TLS)
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#else
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#endif
"\n\n"
"The following command-line options are supported:"s
Expand Down
8 changes: 4 additions & 4 deletions WebTunnel/WebTunnelVNC/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ via command-line arguments. Some settings can also be set using a configuration
information on configuration files), but in most cases no configuration file is needed.

To run `remote-vnc`, you'll need to specify the URL of the remote device to connect
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net).
to (e.g. https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io).

```
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io
```

`remote-vnc` will prompt for your macchina.io REMOTE username and password and
Expand All @@ -43,13 +43,13 @@ The name of the VNC viewer executable can be changed by setting the
command-line parameter:

```
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net -Dvncviewer.executable=myvncviewer
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io -Dvncviewer.executable=myvncviewer
```

Or, on Windows:

```
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net /define:vncviewer.executable=myvncviewer
remote-vnc https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io /define:vncviewer.executable=myvncviewer
```


Expand Down
4 changes: 2 additions & 2 deletions WebTunnel/WebTunnelVNC/src/WebTunnelVNC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ class WebTunnelVNC: public Poco::Util::Application
"<Remote-URI> specifies the URI of the remote device via the\n"
"macchina.io REMOTE server, e.g.:\n"
#if defined(WEBTUNNEL_ENABLE_TLS)
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"https://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#else
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.my-devices.net"
"http://8ba57423-ec1a-4f31-992f-a66c240cbfa0.remote.macchina.io"
#endif
"\n\n"
"The following command-line options are supported:"s
Expand Down

0 comments on commit 19c2214

Please sign in to comment.