Merge remote-tracking branch 'origin/main' into megaleaf

openziti · May 1, 2024 · 9795ce5 · 9795ce5
2 parents 66c133d + 276a5d2
commit 9795ce5
Show file tree

Hide file tree

Showing 6 changed files with 372 additions and 82 deletions.
diff --git a/docusaurus/docs/downloads.mdx b/docusaurus/docs/downloads.mdx
@@ -105,7 +105,7 @@ curl -sS https://get.openziti.io/install.bash \
 
 <br/>
 
-Follow the Debian instructions [to install the `ziti-edge-tunnel` DEB](/reference/tunnelers/60-linux/index.mdx#installing-the-deb)
+Follow the Debian instructions [to install the `ziti-edge-tunnel` DEB](/reference/tunnelers/60-linux/10-debian-package.mdx#installing-the-deb)
 
 <br/>
 
@@ -133,7 +133,7 @@ curl -sS https://get.openziti.io/install.bash \
 
 <br/>
 
-Follow the Red Hat instructions to [install the `ziti-edge-tunnel` RPM](/reference/tunnelers/60-linux/index.mdx#installing-the-rpm)
+Follow the Red Hat instructions to [install the `ziti-edge-tunnel` RPM](/reference/tunnelers/60-linux/20-redhat-package.mdx#installing-the-rpm)
 
 <br/>
 
@@ -150,7 +150,7 @@ Follow the Red Hat instructions to [install the `ziti-edge-tunnel` RPM](/referen
 
 ### Download the `ziti-edge-tunnel` Daemon
 
-Download [the latest binary from GitHub](https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/) and follow the [manual binary install instructions](/reference/tunnelers/60-linux/index.mdx#manual-installation)
+Download [the latest binary from GitHub](https://github.com/openziti/ziti-tunnel-sdk-c/releases/latest/) and follow the [manual binary install instructions](/reference/tunnelers/60-linux/20-redhat-package.mdx#manual-installation)
 
 <br/>
 

diff --git a/docusaurus/docs/guides/deployments/10-linux/10-controller/10-deploy.mdx b/docusaurus/docs/guides/deployments/10-linux/10-controller/10-deploy.mdx
@@ -20,9 +20,16 @@ We'll cover the following topics:
 
 The controller package provides a service unit and, if bootstrapping is enabled, will generate a configuration based on the bootstrapping answer file. The `openziti` package provides the `ziti` CLI and is installed automatically as a dependency. Run the install script for RPM and Debian distributions or manually configure the package repo and install package `openziti-controller`.
 
+Download and run the install script.
+
+```text
+wget https://get.openziti.io/install.bash
+```
+
+Install interactively so that you will have an opportunity to answer questions about generating a configuration.
+
 ```text
-curl -sS https://get.openziti.io/install.bash \
-| sudo bash -s openziti-controller
+sudo bash ./install.bash openziti-controller
 ```
 
 <LinuxPackageRepo />

diff --git a/docusaurus/docs/guides/deployments/10-linux/20-router/10-deploy.mdx b/docusaurus/docs/guides/deployments/10-linux/20-router/10-deploy.mdx
@@ -15,9 +15,16 @@ Routers provide Ziti network entry and exit points for clients and smart routing
 
 The router package `openziti-router` provides a systemd service unit and optional bootstrapping. The package depends on the `openziti` package which provides the `ziti` CLI. The easiest way to install both is the cross-platform install script for RPM and Debian distributions.
 
+Download and run the install script.
+
+```text
+wget https://get.openziti.io/install.bash
+```
+
+Install interactively so that you will have an opportunity to answer questions about generating a configuration.
+
 ```text
-curl -sS https://get.openziti.io/install.bash \
-| sudo bash -s openziti-router
+sudo bash ./install.bash openziti-router
 ```
 
 <LinuxPackageRepo />
@@ -83,23 +90,6 @@ You may set `ZITI_ROUTER_PORT` in `/opt/openziti/etc/router/bootstrap.env` to bo
 
 Clients "learn" the router's address and port when they poll the controller for authorized routers, so it is not necessary to re-enroll or re-create the client if the router's address or port changes. Simply change the config, bounce the router, and it will begin advertising the new address and port. This works because the system service and Docker container both auto-renew their server certificate every startup, and the certificate's DNS subject alternative name is set in the router's config.yml file. If you set `ZITI_AUTO_RENEW_CERTS=false` then it's necessary to administratively re-create the router or run at least once with the `--extend` flag.
 
-## Agent
-
-The router provides an IPC agent for administration. The agent listens on a Unix domain socket inside the filesystem namespace of the router service. Here's an example for querying the router's agent for statistics.
-
-```text
-systemctl show -p MainPID --value ziti-router.service \
-| xargs -rIPID sudo nsenter --target PID --mount -- \
-    ziti agent stats
-```
-
-```buttonless title="Output"
-goroutines: 38
-OS threads: 20
-GOMAXPROCS: 16
-num CPU: 16
-```
-
 ## Logging
 
 View the router service's output with `journalctl -u ziti-router.service`.