resolve merge conflicts with remote

tutos/server.md

@@ -3,6 +3,7 @@ ssh huho@62.210.206.99
 ---
 
 install new os steps :
+
 - exemple os : proxmox
 - connect to ecowan
 - activate IPMI (Intelligent Platform Management Interface) :
@@ -19,6 +20,7 @@ install new os steps :
 		- i also added it to the PATH **~/.local/bin/idracclient.py** so you can call it from anywhere like that : **idracclient.py <ip> -u <username>**
 	3. or use a java console, manually (you need to download all the java packages),
 		- folder architecture :
+		```
 			idrac-folder/
 			├── jre/                       ← contains bin/java
 			├── jnlp/                      ← optional: keep the original .jnlp here for backup
@@ -27,6 +29,7 @@ install new os steps :
 			│   ├── libavctKVMIO.so
 			│   └── libavmLinux.so
 			└── start-virtual-console.sh
+		```
 		- jre/ :
 			- download from oracle : https://www.oracle.com/java/technologies/javase/javase7-archive-downloads.html
 			- download  `1.7.0_80 or 1.7.0_79` : `jre-7u80-macosx-x64.tar.gz` or `jre-7u79-macosx-x64.tar.gz` (need to create an account)
@@ -135,12 +138,76 @@ todo list :
 	- [ ] Monitor with cockpit or netdata
 	- [ ] Set up email notifications for Proxmox alerts
 
-
 ---
 
 install pbs on a vm on proxmox (Proxmox Backup Server) -> to have incremental backups
 
 ---
+when i connect to proxmox i get this message : You do not have a valid subscription for this server. Please visit www.proxmox.com to get a list of available options.
+ChatGPT said:
+
+Yep, that message is normal if you're using the free version of Proxmox without a paid subscription.
+💡 What it means
+
+    Proxmox VE (Virtual Environment) is open source and free to use.
+
+    But they offer enterprise support via paid subscriptions.
+
+    That message is just a reminder—it doesn’t block any functionality (except access to the enterprise repo).
+
+✅ Your Options
+1. Ignore It
+
+    Totally safe to ignore.
+
+    It just appears after login on the web UI.
+
+2. Disable the Message (UI Only)
+
+You can remove the popup by editing a file on your Proxmox host:
+
+nano /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js
+
+Search for:
+
+if (data.status !== 'Active') {
+
+And change it to:
+
+if (false) {
+
+Then save (Ctrl+O, Enter, Ctrl+X) and clear your browser cache or reboot the UI:
+
+systemctl restart pveproxy
+
+⚠️ Note: This gets overwritten when you update Proxmox, so it’s a temporary cosmetic fix.
+3. Switch to the Free Repo
+
+Make sure you're using the no-subscription repository for updates:
+
+Edit this file:
+
+nano /etc/apt/sources.list.d/pve-enterprise.list
+
+Comment out the enterprise repo:
+
+# deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise
+
+Then add the no-subscription repo:
+
+echo "deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription" > /etc/apt/sources.list.d/pve-no-subscription.list
+
+And update:
+
+apt update && apt full-upgrade
+
+Let me know if you want help setting that up or if you're considering a subscription.
+
+-------------------------------------------------------------------------------------
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+                                    END PROXMOX
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+-------------------------------------------------------------------------------------
 
 ipv6 : fe80::d6ae:52ff:fec9:29d6
 netmask : 64
@@ -161,6 +228,9 @@ gateway : fe80::226:bff:feef:59ff
 	- **ssh-copy-id -o PreferredAuthentications=password -i /path/to/key.pub <username>@<server_ip>**
 - first time you authenticate by key :
 	- **ssh -i /path/to/key <username>@<server_ip>**
+- if next times you still need it ?
+	- check if key is loaded into agent : **ssh-add -l**
+	- if not, add it : **ssh-add ~/.ssh/your_key**
 
 
 ## list user : **cat /etc/passwd**

uninstall.sh

@@ -29,34 +29,56 @@ function restore_bak
 # receive 1 argument : absolute path to config file
 function uninstall
 {
-	file_to="$1"
+	local file_to="$1"
-	file_name="$(basename $1)"
+	local file_name="$(basename "$1")"
-	path_file_to="$(dirname $1)"
+	local path_file_to="$(dirname "$1")"
+
+	echo -e $B_BLUE"--- Uninstalling \"$file_name\" ---"$ENDCO
+
 	# -L check if is symlink
-	if [ -f $file_to ] && [ -L $file_to ]
+	if [ -L "$file_to" ]
 	then
-		if grep -q $KEY_PHRASE $file
+		echo -e $YELLOW"Found symlink: $file_to"$ENDCO
-		then
+		# The symlink target is what we need to check for the key phrase
-			if [ -f $file_to.hubak0 ]
+		local target_file=$(readlink "$file_to")
-			then
+		if [ ! -f "$target_file" ]; then
-				echo -en $YELLOW"in "
+			echo -e $RED"Symlink is broken."$ENDCO
-				echo -en $CYAN"\"$path_file_to/\""
+			# Decide if you want to do something with broken symlinks, e.g. remove them.
-				echo -en $YELLOW", rm symlink "
+			return
-				echo -en $CYAN"\"$file_name\""$ENDCO"\n"
-				rm $file_to
-				restore_bak $file_to
-			fi
 		fi
+
+		if grep -q "$KEY_PHRASE" "$target_file"
+		then
+			echo -e $GREEN"Key phrase found. This is one of our config files."$ENDCO
+			echo -en $YELLOW"in "
+			echo -en $CYAN"\"$path_file_to/\""
+			echo -en $YELLOW", rm symlink "
+			echo -en $CYAN"\"$file_name\""$ENDCO"\n"
+			rm "$file_to"
+
+			if [ -f "$file_to.hubak0" ]
+			then
+				restore_bak "$file_to"
+			else
+				echo -e $YELLOW"No backup file found to restore."$ENDCO
+			fi
+		else
+			echo -e $RED"Key phrase not found. Skipping to avoid removing a file not managed by this script."$ENDCO
+		fi
+	else
+		echo -e $YELLOW"Not a symlink, or does not exist. Skipping: $file_to"$ENDCO
 	fi
+	echo # Add a blank line for readability
 }
 
 
 # argument : directory where the config file should go
+echo -e $B_MAGENTA"--- Starting uninstall process ---"$ENDCO"\n"
 uninstall "$HOME/.screenrc"
 uninstall "$HOME/.vimrc"
 uninstall "$HOME/.zshrc"
-uninstall "$home/.vim/templates/skeleton_color.h"
+uninstall "$HOME/.vim/templates/skeleton_colors.h"
-uninstall "$home/.vim/templates/skeleton.cpp"
+uninstall "$HOME/.vim/templates/skeleton.cpp"
-uninstall "$home/.vim/templates/skeleton.hpp"
+uninstall "$HOME/.vim/templates/skeleton.hpp"
-uninstall "$home/.vim/templates/skeleton_main.cpp"
+uninstall "$HOME/.vim/templates/skeleton_main.cpp"
-uninstall "$home/.vim/templates/skeleton_makefile"
+uninstall "$HOME/.vim/templates/skeleton_makefile"