diff --git a/docs/docs/contributing_using_devbox.md b/docs/docs/contributing_using_devbox.md index 58244f82..0aabfe19 100644 --- a/docs/docs/contributing_using_devbox.md +++ b/docs/docs/contributing_using_devbox.md @@ -15,14 +15,14 @@ Needs an official install_devbox.sh script ## Install Ubuntu 20.04 LTS Don't forget to -``` +```bash sudo apt-get updates && sudo apt-get upgrade ``` ### Optional Set all users in sudo group not to require password every time: -``` +```bash sudo visudo ``` @@ -36,14 +36,14 @@ Add this: Create folder to dump into -``` +```bash sudo mkdir /rmm sudo chown ${USER}:${USER} -R /rmm cd /rmm ``` Get dev install script -``` +```bash wget https://raw.githubusercontent.com/silversword411/tacticalrmm-devdocs/blob/main/install_devbox.sh ``` @@ -53,7 +53,7 @@ and replace with your forked repo URL (example commented out below) ## Run it -``` +```bash ./install_devbox.sh ``` ## Watch for @@ -98,7 +98,16 @@ pip install -r requirements.txt Then run tests -``` +```bash python manage.py test ``` +## Misc Notes + +### Spinning up front end web interface in development + + +```bash +cd /web +npm run serve +``` \ No newline at end of file diff --git a/docs/docs/contributing_using_docker.md b/docs/docs/contributing_using_docker.md new file mode 100644 index 00000000..b2fc3df6 --- /dev/null +++ b/docs/docs/contributing_using_docker.md @@ -0,0 +1,48 @@ + + +## Install WSL2 + +https://docs.microsoft.com/en-us/windows/wsl/install-win10 + + +## Install Docker Desktop + +https://www.docker.com/products/docker-desktop + +### Configure Docker + +Make sure it doesn't look like this +![img](images/docker_WSL2_distros_missing.png) + +This is better + +![img](images/docker_with_ubuntu-20.04.png) + +### Check and make sure WSL is v2 and set Ubuntu as default + +[https://docs.microsoft.com/en-us/windows/wsl/install-win10#set-your-distribution-version-to-wsl-1-or-wsl-2](https://docs.microsoft.com/en-us/windows/wsl/install-win10#set-your-distribution-version-to-wsl-1-or-wsl-2) + +![img](images/wls2_upgrade_and_set_default.png) + +## Create .env file + +Under .devcontainer duplicate + +``` +.env.example +``` + +as + +``` +.env +``` + +Customize to your tastes (it doesn't need to be internet configured, just add records in your `hosts` file) eg + +``` +127.0.0.1 rmm.example.com +127.0.0.1 api.example.com +127.0.0.1 mesh.example.com +``` + diff --git a/docs/docs/images/celebrate.gif b/docs/docs/images/celebrate.gif new file mode 100644 index 00000000..16551e91 Binary files /dev/null and b/docs/docs/images/celebrate.gif differ diff --git a/docs/docs/images/docker_WSL2_distros_missing.png b/docs/docs/images/docker_WSL2_distros_missing.png new file mode 100644 index 00000000..37e9917f Binary files /dev/null and b/docs/docs/images/docker_WSL2_distros_missing.png differ diff --git a/docs/docs/images/docker_with_ubuntu-20.04.png b/docs/docs/images/docker_with_ubuntu-20.04.png new file mode 100644 index 00000000..08804cac Binary files /dev/null and b/docs/docs/images/docker_with_ubuntu-20.04.png differ diff --git a/docs/docs/images/installcomplete.png b/docs/docs/images/installcomplete.png new file mode 100644 index 00000000..d599fe12 Binary files /dev/null and b/docs/docs/images/installcomplete.png differ diff --git a/docs/docs/images/wls2_upgrade_and_set_default.png b/docs/docs/images/wls2_upgrade_and_set_default.png new file mode 100644 index 00000000..ebd775ab Binary files /dev/null and b/docs/docs/images/wls2_upgrade_and_set_default.png differ diff --git a/web/src/components/modals/agents/AgentDownload.vue b/web/src/components/modals/agents/AgentDownload.vue index 021737c9..4ddf526c 100644 --- a/web/src/components/modals/agents/AgentDownload.vue +++ b/web/src/components/modals/agents/AgentDownload.vue @@ -53,6 +53,12 @@ To use a domain CA +
-desc "Desired custom description on agent"
+ Note: the auth token above will be valid for {{ info.expires }} hours.
diff --git a/web/src/components/modals/coresettings/EditCoreSettings.vue b/web/src/components/modals/coresettings/EditCoreSettings.vue index 9c371f07..d78c1458 100644 --- a/web/src/components/modals/coresettings/EditCoreSettings.vue +++ b/web/src/components/modals/coresettings/EditCoreSettings.vue @@ -25,7 +25,9 @@