DietPi-Software | vaultwarden: Rename from Bitwarden_RS

.meta/dietpi-survey_report

@@ -473,7 +473,7 @@ shopt -s extglob
 	unset -v 'aSOFTWARE_NAME6_34[137]' # CloudPrint
 	aSOFTWARE_NAME6_34[181]='PaperMC'
 	aSOFTWARE_NAME6_34[182]='Unbound'
-	aSOFTWARE_NAME6_34[183]='Bitwarden_RS'
+	aSOFTWARE_NAME6_34[183]='vaultwarden'
 	aSOFTWARE_NAME6_34[184]='Tor Relay'
 	aSOFTWARE_NAME6_34[185]='Portainer'
 

.update/patches

@@ -94,5 +94,34 @@ then
 	dpkg-query -s haveged &> /dev/null || G_AGI haveged
 fi
 
+# v7.2: Rename Bitwarden_RS into vaultwarden: https://github.com/MichaIng/DietPi/issues/4325
+if [[ -d '/mnt/dietpi_userdata/bitwarden_rs' ]]
+then
+	G_DIETPI-NOTIFY 2 'vaultwarden will be reinstalled now.'
+	# Remove Bitwarden_RS service
+	if [[ -f '/etc/systemd/system/bitwarden_rs.service' ]]
+	then
+		G_EXEC systemctl disable --now bitwarden_rs
+		G_EXEC rm /etc/systemd/system/bitwarden_rs.service
+	fi
+	[[ -d '/etc/systemd/system/bitwarden_rs.service.d' ]] && G_EXEC rm -R /etc/systemd/system/bitwarden_rs.service.d
+	# Remove Bitwarden_RS user and group
+	getent passwd bitwarden_rs > /dev/null && G_EXEC userdel bitwarden_rs
+	getent group bitwarden_rs > /dev/null && G_EXEC groupdel bitwarden_rs
+	# Remove Bitwarden_RS install directory
+	[[ -d '/opt/bitwarden_rs' ]] && G_EXEC rm -R /opt/bitwarden_rs
+	# Update and rename Bitwarden_RS config file
+	if [[ -f '/mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env' ]]
+	then
+		G_CONFIG_INJECT 'DATA_FOLDER=' 'DATA_FOLDER=/mnt/dietpi_userdata/vaultwarden' /mnt/dietpi_userdata/bitwarden_rs/bitwarden_rs.env
+		G_EXEC mv /mnt/dietpi_userdata/bitwarden_rs/{bitwarden_rs,vaultwarden}.env
+	fi
+	G_EXEC mv /mnt/dietpi_userdata/{bitwarden_rs,vaultwarden}
+	# Start vaultwarden reinstallation
+	/boot/dietpi/dietpi-software reinstall 183 || G_WHIP_MSG '[WARNING] The vaultwarden (re)install failed.
+\nHowever, all required dietpi-update migration steps have been done and it will hence finish.
+\nRepeat the reinstall manually to bring up your new vaultwarden instance, when you find time: "dietpi-software reinstall 183"'
+fi
+
 exit 0
 }

.update/pre-patches

@@ -32,5 +32,23 @@ then
 	G_EXEC curl -sSfL 'https://packages.sury.org/php/apt.gpg' -o /etc/apt/trusted.gpg.d/dietpi-php.gpg
 fi
 
+# v7.2: Rename Bitwarden_RS into vaultwarden: https://github.com/MichaIng/DietPi/issues/4325
+if [[ -d '/mnt/dietpi_userdata/bitwarden_rs' ]]
+then
+	G_WHIP_BUTTON_OK_TEXT='Continue'
+	G_WHIP_BUTTON_CANCEL_TEXT='Cancel'
+	if G_WHIP_YESNO '[ INFO ] Bitwarden_RS detected
+\nDue to user confusion and to avoid any possible trademark/brand issues with the official Bitwarden server, Bitwarden_RS has been renamed to vaultwarden by its author: https://github.com/dani-garcia/vaultwarden/discussions/1642
+\nTo be able to continue providing support for vaultwarden, DietPi-Update will force a re-installation. This process can take 30 minutes up to several hours, especially on slower SBCs like RPi Zero and similar, like it was on the initial Bitwarden_RS install you did.
+\nContinue DietPi-Update now, if you are ok with the re-installation of vaultwarden and grab yourself a coffee or tee. If not, you are ok to cancel the update process and return later.
+\nNB: All your passwords, data and config will be preserved by the re-installation process.'
+	then
+		G_DIETPI-NOTIFY 2 'vaultwarden will be reinstalled during DietPi-Update incremental patches.'
+	else
+		G_DIETPI-NOTIFY 2 'DietPi-Update aborted by user.'
+		exit 1
+	fi
+fi
+
 exit 0
 }

README.md

@@ -1,14 +1,14 @@
-<h1 align="center"><img src="https://raw.githubusercontent.com/MichaIng/DietPi-Website/master/images/dietpi-logo_180x180.png" alt="DietPi Logo"></h1>
+<h1 align="center"><img src="https://raw.githubusercontent.com/MichaIng/DietPi-Website/master/images/dietpi-logo_180x180.png" alt="DietPi logo" width="180" height="180" loading="lazy"></h1>
 <p align="center">
 	<b>Lightweight justice for your single-board computer!</b>
 	<br><br>
 	optimised • simplified • for everyone
 	<br><br>
-	<a href="https://dietpi.com/">Website</a> • <a href="https://dietpi.com/docs/">Documentation</a> • <a href="https://dietpi.com/#download">View all supported platforms</a> • <a href="https://dietpi.com/phpbb/">Forum</a>
+	<a href="https://dietpi.com/" target="_blank" rel="noopener">Website</a> • <a href="https://dietpi.com/docs/" target="_blank" rel="noopener">Documentation</a> • <a href="https://dietpi.com/#download" target="_blank" rel="noopener">View all supported platforms</a> • <a href="https://dietpi.com/phpbb/" target="_blank" rel="noopener">Forum</a>
 </p>
 <hr>
 <p align="center">
-	<strong>Ready to run</strong> optimised software choices with <a href="https://dietpi.com/dietpi-software.html"><strong>dietpi-software</strong></a>
+	<strong>Ready to run</strong> optimised software choices with <a href="https://dietpi.com/dietpi-software.html" target="_blank" rel="noopener"><strong>dietpi-software</strong></a>
 	<br>Feature-rich configuration tool for your device with <strong>dietpi-config</strong>.
 </p>
 <hr>
@@ -19,7 +19,7 @@ DietPi is an extremely lightweight Debian-based OS. It is highly optimised for m
 
 The **dietpi programs** use lightweight whiptail menus. You'll spend more time enjoying DietPi and applications you need and less time staring at the command line.
 
-Use `dietpi-software` to quick and easy install **Ready to Run** & **Optimised** applications for your system. DietPi will do all the necessary configurations, including starting the services. Few highlights: [Desktop Environments](https://dietpi.com/docs/dietpi_optimised_software/#desktops), [Remote Desktop access](https://dietpi.com/docs/dietpi_optimised_software/#remote-desktop-remote-access), [Media Systems and Players](https://dietpi.com/docs/dietpi_optimised_software/#media-systems), [BitTorrent & Downloading](https://dietpi.com/docs/dietpi_optimised_software/#bittorrent-download-tools), [Cloud and Backup](https://dietpi.com/docs/dietpi_optimised_software/#cloud-backup-systems), [Gaming](https://dietpi.com/docs/dietpi_optimised_software/#gaming-emulation), [Social & Search](https://dietpi.com/docs/dietpi_optimised_software/#social-search), [Camera & Surveillance](https://dietpi.com/docs/dietpi_optimised_software/#camera-surveillance), [Networking](https://dietpi.com/docs/dietpi_optimised_software/#advanced-networking), [System Stats & Management](https://dietpi.com/docs/dietpi_optimised_software/#system-stats-management), [Home Automation](https://dietpi.com/docs/dietpi_optimised_software/#home-automation), [Hardware & Voice Projects](https://dietpi.com/docs/dietpi_optimised_software/#hardware-projects), [web server stacks](https://dietpi.com/docs/dietpi_optimised_software/#web-development), [DNS Servers / Pi-hole](https://dietpi.com/docs/dietpi_optimised_software/#dns-servers), [File Servers](https://dietpi.com/docs/dietpi_optimised_software/#file-servers), [Cloud printing & Print 3D](https://dietpi.com/docs/dietpi_optimised_software/#printing-server) and much more.
+Use `dietpi-software` to quick and easy install **Ready to Run** & **Optimised** applications for your system. DietPi will do all the necessary configurations, including starting the services. Few highlights: [Desktop Environments](https://dietpi.com/docs/software/desktop/), [Remote Desktop Access](https://dietpi.com/docs/software/remote_desktop/), [Media Systems & Players](https://dietpi.com/docs/software/media/), [BitTorrent & Downloading](https://dietpi.com/docs/software/bittorrent/), [Cloud & Backup](https://dietpi.com/docs/software/cloud/), [Gaming & Emulation](https://dietpi.com/docs/software/gaming/), [Social & Search](https://dietpi.com/docs/software/social/), [Camera & Surveillance](https://dietpi.com/docs/software/camera/), [Networking](https://dietpi.com/docs/software/advanced_networking/), [System Stats & Management](https://dietpi.com/docs/software/system_stats/), [Home Automation](https://dietpi.com/docs/software/home_automation/), [Hardware & Voice Projects](https://dietpi.com/docs/software/hardware_projects/), [Webserver Stacks](https://dietpi.com/docs/software/webserver_stack/), [DNS Servers / Pi-hole](https://dietpi.com/docs/software/dns_servers/), [File Servers](https://dietpi.com/docs/software/file_servers/), [Printing](https://dietpi.com/docs/software/printing/) and much more.
 
 Use `dietpi-services` to control which installed software has higher or lower priority levels (nice, affinity, policy scheduler).
 
@@ -279,7 +279,7 @@ Links to hardware and software manufacturers, sources and build instructions use
 - [Bazarr](https://github.com/morpheus65535/bazarr)
 - [PaperMC](https://github.com/PaperMC/Paper)
 - [Unbound](https://github.com/NLnetLabs/unbound)
-- [Bitwarden_RS](https://github.com/dani-garcia/bitwarden_rs)
+- [vaultwarden](https://github.com/dani-garcia/vaultwarden)
 - [Docker](https://github.com/docker/docker-ce)
 - [Portainer](https://github.com/portainer/portainer)
 - [Tor](https://gitlab.torproject.org/tpo/core/tor)
@@ -296,9 +296,7 @@ Links to hardware and software manufacturers, sources and build instructions use
 
 ---
 
-<html>
-	<p align="center">
-		<img src="https://www.myvirtualserver.com/images/myvirtualserver_logo.png" alt="myVirtualserver Logo" width="200">
-		<br>DietPi's web hosting is powered by <a href="https://www.myvirtualserver.com">myVirtualserver</a>.
-	</p>
-</html>
+<p align="center">
+	<img src="https://www.myvirtualserver.com/images/myvirtualserver_logo.png" alt="myVirtualserver logo" width="200" height="44" loading="lazy">
+	<br>DietPi's web hosting is powered by <a href="https://www.myvirtualserver.com" target="_blank" rel="noopener">myVirtualserver</a>.
+</p>

dietpi/dietpi-services

@@ -144,7 +144,7 @@ Available services:
 			'gogs'
 			'gitea'
 			'firefox-sync'
-			'bitwarden_rs'
+			'vaultwarden'
 
 			# - Emulation/Gaming
 			'mineos'