Merge pull request #2 from geekloper/fix_1

fix #1

Author: geekloper

README.md

@@ -41,7 +41,7 @@ This script will:
 Edit the `.env` file to add your Discord bot credentials:
 
 ```sh
-sudo vi /etc/whitelist_bot/.env
+sudo vi /etc/ip_whitelister_bot/.env
 ```
 
 Example `.env` file:
@@ -74,6 +74,10 @@ sudo systemctl status ip_whitelister_bot
 
 View logs:
 
+```sh
+sudo cat /var/log/ip_whitelister_bot.log 
+```
+
 ```sh
 sudo journalctl -u ip_whitelister_bot -f
 ```
@@ -103,7 +107,14 @@ Banning removes their ability to whitelist IPs & deny their ips in UFW.
 
 
 ## Uninstallation
-To remove the bot completely:
+
+Using uninstall.sh 
+
+```sh
+curl -sSL https://raw.githubusercontent.com/geekloper/discord-bot-ip-whitelister/main/uninstall.sh  | sudo bash
+```
+
+Or this commands if installed manually:
 
 ```sh
 sudo systemctl stop ip_whitelister_bot

config/env.go

@@ -9,9 +9,12 @@ import (
 
 // LoadEnv loads environment variables from a .env file
 func LoadEnv() {
-	err := godotenv.Load()
-	if err != nil {
-		log.Fatal("Error loading .env file")
+	if os.Getenv("BOT_TOKEN") == "" {
+		// Only load .env if not already set by the environment (like systemd)
+		err := godotenv.Load("/etc/ip_whitelister_bot/.env")
+		if err != nil {
+			log.Fatal("Error loading .env file")
+		}
 	}
 }
 

install.sh

@@ -34,7 +34,7 @@ mkdir -p /var/log
 
 
 # Download the latest release from GitHub
-GITHUB_REPO="geekloper/discord-bot-ip-whitelister"  # Remplace par ton repo GitHub
+GITHUB_REPO="geekloper/discord-bot-ip-whitelister"
 LATEST_RELEASE_URL=$(curl -s https://api.github.com/repos/$GITHUB_REPO/releases/latest | grep "browser_download_url" | cut -d '"' -f 4)
 
 if [[ -z "$LATEST_RELEASE_URL" ]]; then
@@ -87,6 +87,7 @@ EOL
 # Setting the correct permissions
 chown -R whitelistbot:whitelistbot /var/lib/ip_whitelister_bot
 chmod 600 /etc/ip_whitelister_bot/.env
+chown whitelistbot:whitelistbot /etc/ip_whitelister_bot/.env
 
 
 # Give bot sudo permission for UFW

uninstall.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e  # Exit immediately if a command fails
+
+echo "🧹 Uninstalling the Discord Whitelist Bot..."
+
+# 1. Stop and disable the systemd service if it exists
+if systemctl list-units --full -all | grep -Fq "ip_whitelister_bot.service"; then
+    echo "🛑 Stopping and disabling the service..."
+    systemctl stop ip_whitelister_bot
+    systemctl disable ip_whitelister_bot
+    systemctl daemon-reload
+else
+    echo "  Service not found, skipping stop/disable."
+fi
+
+# 2. Remove the systemd service file
+if [ -f /etc/systemd/system/ip_whitelister_bot.service ]; then
+    echo "🗑️ Removing systemd service file..."
+    rm -f /etc/systemd/system/ip_whitelister_bot.service
+    systemctl daemon-reload
+else
+    echo "  Systemd service file already removed."
+fi
+
+# 3. Remove the bot binary
+if [ -f /usr/local/bin/ip_whitelister_bot ]; then
+    echo "🗑️ Removing bot executable..."
+    rm -f /usr/local/bin/ip_whitelister_bot
+fi
+
+# 4. Remove environment and configuration files
+if [ -d /etc/ip_whitelister_bot ]; then
+    echo "🗑️ Removing configuration directory..."
+    rm -rf /etc/ip_whitelister_bot
+fi
+
+# 5. Preserve logs: Do NOT delete /var/log/ip_whitelister_bot.log
+echo "🛑 Skipping log file removal (preserving /var/log/ip_whitelister_bot.log)."
+
+# 6. Remove bot data directory (only /var/lib/ip_whitelister_bot)
+if [ -d /var/lib/ip_whitelister_bot ]; then
+    echo "🗑️ Removing bot data directory..."
+    rm -rf /var/lib/ip_whitelister_bot
+fi
+
+# 7. Remove sudoers permission
+if [ -f /etc/sudoers.d/ip_whitelister_bot ]; then
+    echo "🗑️ Removing sudoers file..."
+    rm -f /etc/sudoers.d/ip_whitelister_bot
+fi
+
+# 8. Remove system user and group
+if id "whitelistbot" &>/dev/null; then
+    echo "👤 Deleting system user whitelistbot..."
+    userdel whitelistbot || true
+else
+    echo "  User whitelistbot not found."
+fi
+
+echo "✅ Uninstallation completed successfully!"