diff --git a/README.de.md b/README.de.md index 9723c5ad..6273f237 100644 --- a/README.de.md +++ b/README.de.md @@ -25,12 +25,12 @@ MySpeed ist eine Speedtest-Analyse-Software, welche die Geschwindigkeit deines I - 🗄️ Füge mehrere Server direkt zu einer MySpeed-Instanz hinzu - 🩺 Es lassen sich Healthchecks konfigurieren, welche dich bei Fehlern oder Ausfällen über E-Mail, Signal, WhatsApp oder Telegram benachrichtigen können - 📆 Testergebnisse lassen sich bis zu 30 Tage lang speichern -- 💁 Erfahre mehr zu MySpeed in der [Dokumentation](https://myspeed.gnmyt.dev) +- 💁 Erfahre mehr zu MySpeed auf unserer [Website](https://myspeed.dev) ### ⬇️ Installation -- **🐧 Anleitung für [Linux](https://myspeed.gnmyt.dev/setup/linux)** -- **🪟 Anleitung für [Windows](https://myspeed.gnmyt.dev/setup/windows)** +- **🐧 Anleitung für [Linux](https://docs.myspeed.dev/setup/linux)** +- **🪟 Anleitung für [Windows](https://docs.myspeed.dev/setup/windows)** ### 📸 Beispiel-Screenshots diff --git a/README.md b/README.md index 61a805e7..ff6494d8 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,12 @@ MySpeed is a speed test analysis software that records your internet speed for u - 🗄️ Add multiple servers directly to a MySpeed instance - 🩺 Configure health checks to notify you via email, Signal, WhatsApp, or Telegram in case of errors or downtime - 📆 Test results can be stored for up to 30 days -- 💁 Learn more about MySpeed in the documentation +- 💁 Learn more about MySpeed on our [website](https://myspeed.dev) ### ⬇️ Installation -- **🐧 Guide for [Linux](https://myspeed.gnmyt.dev/setup/linux)** -- **🪟 Guide for [Windows](https://myspeed.gnmyt.dev/setup/windows)** +- **🐧 Guide for [Linux](https://docs.myspeed.dev/setup/linux)** +- **🪟 Guide for [Windows](https://docs.myspeed.dev/setup/windows)** ### 📸 Example Screenshots diff --git a/chooser.sh b/chooser.sh index 0a799416..47965ed3 100644 --- a/chooser.sh +++ b/chooser.sh @@ -18,7 +18,7 @@ fi echo -e "${GREEN}---------${BLUE} MySpeed Installation ${GREEN}---------${NORMAL}" echo -e "${BLUE}Welcome to MySpeed Installation Script!${NORMAL}" echo -e "${YELLOW}Do you want to install MySpeed with Docker or the normal installation script?${NORMAL}" -echo -e "${YELLOW}[1]${NORMAL} Docker" +echo -e "${YELLOW}[1]${NORMAL} Docker (Recommended)" echo -e "${YELLOW}[2]${NORMAL} Normal Install Script" read -p "Enter your choice (1/2): " choice diff --git a/client/src/index.jsx b/client/src/index.jsx index ec182914..5c62477e 100644 --- a/client/src/index.jsx +++ b/client/src/index.jsx @@ -3,7 +3,7 @@ import ReactDOM from "react-dom/client"; import App from './App'; export const PROJECT_URL = "https://github.com/gnmyt/myspeed"; -export const PROJECT_WIKI = "https://myspeed.gnmyt.dev"; +export const PROJECT_WIKI = "https://docs.myspeed.dev"; const root = ReactDOM.createRoot(document.getElementById('root')); diff --git a/mkdocs.yml b/mkdocs.yml index cf2341e3..9fe6b204 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,5 @@ site_name: MySpeed Documentation -site_url: https://myspeed.gnmyt.dev +site_url: https://docs.myspeed.dev site_description: MySpeed is a self-hosted speedtest analysis software that stores the speed of your internet for up to 30 days. site_author: Mathias Wagner copyright: Copyright © 2021 - 2023 Mathias Wagner diff --git a/uninstall.sh b/uninstall.sh index 776d3477..e8ac6b07 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Colors for better overview + GREEN='\033[0;32m' BLUE='\033[1;34m' YELLOW='\033[1;33m' @@ -8,52 +8,62 @@ RED='\033[1;31m' NORMAL='\033[0;39m' INSTALLATION_PATH="/opt/myspeed" +DOCKER_INSTALLATION_PATH="/opt/myspeed-dockerized" -# Root check if [ $EUID -ne 0 ]; then - echo -e "$RED✗ Fehler bei der Deinstallation:$NORMAL Du benötigst Root-Rechte, um die Deinstallation zu starten." + echo -e "$RED✗ Uninstallation Error:$NORMAL You need root privileges to initiate the uninstallation." exit fi -echo -e "$GREEN ---------$BLUE Automatische Deinstallation$GREEN ---------" -echo -e "$BLUE MySpeed$YELLOW wird nun deinstalliert." -echo -e "$YELLOW Wenn du$RED abbrechen$YELLOW möchtest, kannst du die" -echo -e "$YELLOW Deinstallation mit$RED STRG + C$YELLOW abbrechen. " -echo -e "$GREEN Die Deinstallation beginnt in 5 Sekunden..." +echo -e "$GREEN ---------$BLUE Automatic Uninstallation$GREEN ---------" +echo -e "$BLUE MySpeed$YELLOW is now being uninstalled." +echo -e "$YELLOW If you want to$RED cancel$YELLOW, you can abort the uninstallation by pressing$RED CTRL + C$YELLOW." +echo -e "$GREEN Uninstallation will begin in 5 seconds..." echo -e "$GREEN ----------------------------------------------" sleep 5 clear -echo -e "$BLUE🔎 Status:$NORMAL Die Servicedaten werden entfernt, falls vorhanden..." +echo -e "$BLUE🔎 Status:$NORMAL Removing service data if present..." sleep 3 -# remove system file -if command -v systemctl &> /dev/null && systemctl --all --type service | grep -n "myspeed.service"; then - systemctl stop myspeed - systemctl disable myspeed - rm /etc/systemd/system/myspeed.service - rm /usr/lib/systemd/system/myspeed.service - systemctl daemon-reload - systemctl reset-failed -fi - -clear -echo -e "$BLUE🔎 Status:$NORMAL Die MySpeed-Systemdaten werden entfernt, falls vorhanden..." -sleep 3 - -# remove folder -if [ "$1" == "--keep-data" ]; then - mv $INSTALLATION_PATH/data /tmp/myspeed_data - rm -R $INSTALLATION_PATH - mkdir $INSTALLATION_PATH - mv /tmp/myspeed_data $INSTALLATION_PATH/data +if docker ps -a --format '{{.Names}}' | grep -q "MySpeed"; then + echo -e "$YELLOW Found Docker container. Stopping the container..." + docker stop MySpeed + echo -e "$YELLOW Removing Docker container..." + docker rm MySpeed + echo -e "$YELLOW Removing MySpeed Docker folder..." + if [ "$1" != "--keep-data" ]; then + docker volume rm myspeed-dockerized_myspeed + fi + rm -rf $DOCKER_INSTALLATION_PATH else - rm -R $INSTALLATION_PATH + if command -v systemctl &> /dev/null && systemctl --all --type service | grep -n "myspeed.service"; then + systemctl stop myspeed + systemctl disable myspeed + rm /etc/systemd/system/myspeed.service + rm /usr/lib/systemd/system/myspeed.service + systemctl daemon-reload + systemctl reset-failed + fi + + clear + echo -e "$BLUE🔎 Status:$NORMAL Removing MySpeed system data if present..." + sleep 3 + + # Remove folder + if [ "$1" == "--keep-data" ]; then + mv $INSTALLATION_PATH/data /tmp/myspeed_data + rm -R $INSTALLATION_PATH + mkdir $INSTALLATION_PATH + mv /tmp/myspeed_data $INSTALLATION_PATH/data + else + rm -R $INSTALLATION_PATH + fi fi clear echo -e "$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-" #multicolor -echo -e "$GREEN✓ Fertig: $NORMAL MySpeed wurde deinstalliert." -echo -e "$NORMAL Du kannst MySpeed jederzeit wieder installieren. Die Anleitung dazu findest du auf myspeed.gnmyt.dev/setup/linux." -echo -e "$RED Danke, dass du MySpeed genutzt hast!" +echo -e "$GREEN✓ Completed: $NORMAL MySpeed has been uninstalled." +echo -e "$NORMAL You can reinstall MySpeed anytime. Find the instructions at https://myspeed.dev/install." +echo -e "$RED Thank you for using MySpeed!" echo -e "$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-$GREEN-$NORMAL-" #multicolor diff --git a/web/src/common/components/Navigation/Navigation.jsx b/web/src/common/components/Navigation/Navigation.jsx index 03299cf4..c052b90a 100644 --- a/web/src/common/components/Navigation/Navigation.jsx +++ b/web/src/common/components/Navigation/Navigation.jsx @@ -43,7 +43,7 @@ export const Navigation = () => {