Merge branch 'master' into v1
This commit is contained in:
commit
52805be470
12
README.md
12
README.md
|
@ -36,7 +36,7 @@ Examples
|
||||||
|
|
||||||
You do this:
|
You do this:
|
||||||
|
|
||||||
curl -fsSL https://get.telebit.cloud | bash
|
curl -fsSL https://get.telebit.io | bash
|
||||||
|
|
||||||
You get this:
|
You get this:
|
||||||
|
|
||||||
|
@ -70,19 +70,19 @@ Mac & Linux
|
||||||
Open Terminal and run this install script:
|
Open Terminal and run this install script:
|
||||||
|
|
||||||
```
|
```
|
||||||
curl -fsSL https://get.telebit.cloud | bash
|
curl -fsSL https://get.telebit.io | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
```
|
```
|
||||||
bash <( curl -fsSL https://get.telebit.cloud )
|
bash <( curl -fsSL https://get.telebit.io )
|
||||||
```
|
```
|
||||||
|
|
||||||
<small>
|
<small>
|
||||||
Note: **fish**, **zsh**, and other **non-bash** users should do this
|
Note: **fish**, **zsh**, and other **non-bash** users should do this
|
||||||
|
|
||||||
```
|
```
|
||||||
curl -fsSL https://get.telebit.cloud/ > get.sh; bash get.sh
|
curl -fsSL https://get.telebit.io/ > get.sh; bash get.sh
|
||||||
```
|
```
|
||||||
</small>
|
</small>
|
||||||
-->
|
-->
|
||||||
|
@ -98,7 +98,7 @@ What does the installer do?
|
||||||
* `~/.config/telebit/telebit.yml`
|
* `~/.config/telebit/telebit.yml`
|
||||||
* `~/.local/share/telebit`
|
* `~/.local/share/telebit`
|
||||||
|
|
||||||
Of course, feel free to inspect it before you run it: `curl -fsSL https://get.telebit.cloud`
|
Of course, feel free to inspect it before you run it: `curl -fsSL https://get.telebit.io`
|
||||||
|
|
||||||
**You can customize the installation**:
|
**You can customize the installation**:
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ export TELEBIT_USERSPACE=no # install as a system service (launchd
|
||||||
export TELEBIT_PATH=/opt/telebit
|
export TELEBIT_PATH=/opt/telebit
|
||||||
export TELEBIT_USER=telebit
|
export TELEBIT_USER=telebit
|
||||||
export TELEBIT_GROUP=telebit
|
export TELEBIT_GROUP=telebit
|
||||||
curl -fsSL https://get.telebit.cloud/ | bash
|
curl -fsSL https://get.telebit.io/ | bash
|
||||||
```
|
```
|
||||||
|
|
||||||
That will change the bundled version of node.js is bundled with Telebit Relay
|
That will change the bundled version of node.js is bundled with Telebit Relay
|
||||||
|
|
|
@ -47,8 +47,8 @@ function help() {
|
||||||
//console.info('\ttelebit init # bootstrap the config files');
|
//console.info('\ttelebit init # bootstrap the config files');
|
||||||
//console.info('');
|
//console.info('');
|
||||||
console.info('\ttelebit status # whether enabled or disabled');
|
console.info('\ttelebit status # whether enabled or disabled');
|
||||||
console.info('\ttelebit enable # disallow incoming connections');
|
console.info('\ttelebit enable # allow incoming connections');
|
||||||
console.info('\ttelebit disable # allow incoming connections');
|
console.info('\ttelebit disable # disallow incoming connections');
|
||||||
console.info('');
|
console.info('');
|
||||||
console.info('\ttelebit list # list rules for servernames and ports');
|
console.info('\ttelebit list # list rules for servernames and ports');
|
||||||
console.info('');
|
console.info('');
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
// node telebit daemon arg1 arg2
|
// node telebit daemon arg1 arg2
|
||||||
if ('daemon' === process.argv[3]) {
|
if ('daemon' === process.argv[2]) {
|
||||||
require('./telebitd.js');
|
require('./telebitd.js');
|
||||||
} else {
|
} else {
|
||||||
require('./telebit-remote.js');
|
require('./telebit-remote.js');
|
||||||
|
|
Loading…
Reference in New Issue