diff --git a/dist/config.toml.example b/dist/config.toml.in similarity index 100% rename from dist/config.toml.example rename to dist/config.toml.in diff --git a/doc/configuration.md b/doc/configuration.md index b0e2e5d..571893d 100644 --- a/doc/configuration.md +++ b/doc/configuration.md @@ -2,4 +2,4 @@ Rayhunter can be configured by editing `/data/rayhunter/config.toml` on the device. You can obtain a shell on [orbic](./orbic.md#obtaining-a-shell) and [tplink](./tplink-m7350.md#obtaining-a-shell) and edit the file manually. In future versions the web UI will allow you to edit the config as well. -View the [default configuration file on GitHub](https://github.com/EFForg/rayhunter/blob/main/dist/config.toml.example). +View the [default configuration file on GitHub](https://github.com/EFForg/rayhunter/blob/main/dist/config.toml.in). diff --git a/doc/installing-from-source.md b/doc/installing-from-source.md index c7a81f3..52c0af0 100644 --- a/doc/installing-from-source.md +++ b/doc/installing-from-source.md @@ -48,5 +48,5 @@ cargo run --bin installer orbic * Root your device on Windows using the instructions here: * Build the web UI using `cd bin/web && npm install && npm run build` * Push the scripts in `scripts/` to `/etc/init.d` on device and make a directory called `/data/rayhunter` using `adb shell` (and sshell for your root shell if you followed the steps above) -* You also need to copy `config.toml.example` to `/data/rayhunter/config.toml` +* You also need to copy `config.toml.in` to `/data/rayhunter/config.toml`. Uncomment the `device` line and set the value to your device type if necessary. * Then run `./make.sh`, which will build the binary, push it over adb, and restart the device. Once it's restarted, Rayhunter should be running! diff --git a/installer/install.ps1 b/installer/install.ps1 index a39df7d..b16f9c4 100644 --- a/installer/install.ps1 +++ b/installer/install.ps1 @@ -70,7 +70,7 @@ function setup_rootshell { function setup_rayhunter { write-host "installing rayhunter..." _serial "AT+SYSCMD=mkdir -p /data/rayhunter" | Out-Host - _adb_push "config.toml.example" "/tmp/config.toml" | Out-Null + _adb_push "config.toml.in" "/tmp/config.toml" | Out-Null _serial "AT+SYSCMD=mv /tmp/config.toml /data/rayhunter" | Out-Host _adb_push "rayhunter-daemon-orbic/rayhunter-daemon" "/tmp/rayhunter-daemon" | Out-Null _serial "AT+SYSCMD=mv /tmp/rayhunter-daemon /data/rayhunter" | Out-Host diff --git a/installer/src/main.rs b/installer/src/main.rs index 7bd8ada..df9997b 100644 --- a/installer/src/main.rs +++ b/installer/src/main.rs @@ -8,7 +8,7 @@ mod tplink; mod util; mod wingtech; -pub static CONFIG_TOML: &str = include_str!("../../dist/config.toml.example"); +pub static CONFIG_TOML: &str = include_str!("../../dist/config.toml.in"); pub static RAYHUNTER_DAEMON_INIT: &str = include_str!("../../dist/scripts/rayhunter_daemon"); #[derive(Parser, Debug)]