merge openwebrx-admin into openwebrx

debian/changelog

@@ -10,6 +10,8 @@ openwebrx (0.21.0) UNRELEASED; urgency=low
   * New reporting infrastructure, allowing WSPR and FST4W spots to be sent to
     wsprnet.org
   * Add some basic filtering capabilities to the map
+  * New arguments to the `openwebrx` command-line to facilitate the
+    administration of users (try `openwebrx admin`)
   * New command-line tool `openwebrx-admin` that facilitates the
     administration of users
   * Default bandwidth changes:

debian/openwebrx.config

@@ -1,7 +1,8 @@
 #!/bin/sh -e
 . /usr/share/debconf/confmodule
 
-if ! openwebrx-admin --silent hasuser admin; then
+db_get openwebrx/admin_user_configured
+if [ "${RET}" != true ]; then
     db_input high openwebrx/admin_user_password || true
     db_go
 fi

debian/openwebrx.postinst

@@ -26,10 +26,12 @@ case "$1" in
     db_get openwebrx/admin_user_password
     if [ ! -z "${RET}" ]; then
       # create initial openwebrx user
-      OWRX_PASSWORD="${RET}" openwebrx-admin --noninteractive adduser admin
+      OWRX_PASSWORD="${RET}" openwebrx admin --noninteractive adduser admin
     fi
     # remove password from debconf database
     db_unregister openwebrx/admin_user_password
+    # set a marker that admin is configured to avoid future questions
+    db_set openwebrx/admin_user_configured true
   ;;
   *)
     echo "postinst called with unknown argument '$1'" 1>&2

debian/openwebrx.templates

@@ -11,6 +11,6 @@ Description: OpenWebRX "admin" user password:
  empty for now. You can return to this prompt at a later time by running the
  command "sudo dpkg-reconfigure openwebrx".
  .
- You can also use the "openwebrx-admin" command to create, delete or manage
+ You can also use the "openwebrx admin" command to create, delete or manage
  existing users. More information is available in by running the command
- "openwebrx-admin --help".
+ "openwebrx admin --help".