From 4d55bc1ae3d244e19e7158eeffdbf3bb3d2eb208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <github@yubiuser.dev>
Date: Mon, 16 Dec 2024 12:08:16 +0100
Subject: [PATCH] pihole -a is gone
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <github@yubiuser.dev>
---
 automated install/basic-install.sh |  4 ++--
 manpages/pihole.8                  | 34 ++++++------------------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index a4ccf434..ef1e372a 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -2446,7 +2446,7 @@ main() {
     if [[ $(pihole-FTL --config webserver.api.pwhash) == '""' ]]; then
         # generate a random password
         pw=$(tr -dc _A-Z-a-z-0-9 </dev/urandom | head -c 8)
-        pihole -a -p "${pw}"
+        pihole setpassword "${pw}"
     fi
 
     # Migrate existing install to v6.0
@@ -2494,7 +2494,7 @@ main() {
     if ((${#pw} > 0)); then
         # display the password
         printf "  %b Web Interface password: %b%s%b\\n" "${INFO}" "${COL_LIGHT_GREEN}" "${pw}" "${COL_NC}"
-        printf "  %b This can be changed using 'pihole -a -p'\\n\\n" "${INFO}"
+        printf "  %b This can be changed using 'pihole setpassword'\\n\\n" "${INFO}"
     fi
 
     if [[ "${useUpdateVars}" == false ]]; then
diff --git a/manpages/pihole.8 b/manpages/pihole.8
index 825a1fd1..5a312efe 100644
--- a/manpages/pihole.8
+++ b/manpages/pihole.8
@@ -7,13 +7,7 @@ Pi-hole : A black-hole for internet advertisements
 
 \fBpihole\fR (\fB-w\fR|\fB-b\fR|\fB--wild\fR|\fB--regex\fR) [options] domain(s)
 .br
-\fBpihole -a\fR \fB-p\fR password
-.br
-\fBpihole -a\fR (\fB-c|-f|-k\fR)
-.br
-\fBpihole -a -i\fR interface
-.br
-\fBpihole -a -l\fR privacylevel
+\fBpihole setpassword\fR password
 .br
 \fBpihole -c\fR [-j|-r|-e]
 .br
@@ -120,25 +114,6 @@ Available commands and options:
                         (regular expressions are supported)
 .br
 
-\fB-a, admin\fR [options]
-.br
-
-    (Admin options):
-.br
-      -p, password      Set Web Interface password
-.br
-      -c, celsius       Set Celsius as preferred temperature unit
-.br
-      -f, fahrenheit    Set Fahrenheit as preferred temperature unit
-.br
-      -k, kelvin        Set Kelvin as preferred temperature unit
-.br
-      -i, interface     Specify dnsmasq's interface listening behavior
-.br
-      -l, privacylevel  <level> Set privacy level
-                        (0 = lowest, 3 = highest)
-.br
-
 \fB-g, updateGravity\fR
 .br
     Update the list of ad-serving domains
@@ -211,6 +186,11 @@ Available commands and options:
                         repositories
 .br
 
+\fBsetpassword\fR
+.br
+    Set Web Interface password
+.br
+
 \fBuninstall\fR
 .br
     Uninstall Pi-hole from your system
@@ -303,7 +283,7 @@ Allow-/denylist manipulation
 Changing the Web Interface password
 .br
 
-\fBpihole -a -p ExamplePassword\fR
+\fBpihole setpassword ExamplePassword\fR
 .br
     Change the password to "ExamplePassword"
 .br