Merge lp:~jseutter/landscape-client/autodiscover-questions into lp:~landscape/landscape-client/trunk

[Jerry Seutter]

This branch adds questions to debconf for server autodiscovery. It asks 3 questions:
- should server autodiscovery be done?
- What string should be used for DNS SRV queries (default to _landscape._tcp.localdomain)
- What string should be used for DNS A queries (default to landscape.localdomain)

I don't have any experience with this so I could be doing something dubious, dastardly or even diabolical.

[Geoff Teale (tealeg)]

+1 Well it looks good to me.

One thing, why the question mark? (naive question)

+_Description: Enable server autodiscovery?

review: Approve

[Jerry Seutter (jseutter)]

> +1 Well it looks good to me.
>
> One thing, why the question mark? (naive question)
>
> +_Description: Enable server autodiscovery?

When I ran through dpkg-reconfigure it seemed to make more sense. In this case it is a Yes/No answer rather than a "use this string" answer, hence why I used the question mark.

[Alberto Donato (ack)]

#1:
+ db_set $PACKAGE/server_autodiscover $TAGS
+ db_set $PACKAGE/autodiscover_srv_query_string $TAGS
+ db_set $PACKAGE/autodiscover_a_query_string $TAGS

I guess a copy/paste error, $TAGS is used in place of the correct variables.

Beside that, looks good, +1!

review: Approve

[lp:~jseutter/landscape-client/autodiscover-questions]

459. By Jerry Seutter on 2012-02-09

Fixing bugs in landscape-client.config

460. By Jerry Seutter on 2012-02-09

Transmitting new settings from debconf back to landscape-client.

461. By Jerry Seutter on 2012-02-10

Adding a default setting to the templates file

462. By Jerry Seutter on 2012-02-24

Merge from trunk.

=== modified file 'debian/landscape-client.config'
--- debian/landscape-client.config	2012-02-14 21:22:39 +0000
+++ debian/landscape-client.config	2012-02-24 01:18:21 +0000
@@ -48,6 +48,9 @@
     update_var "https_proxy" "$CONFIGFILE"
     update_var "otp" "$CONFIGFILE"
     update_var "tags" "$CONFIGFILE"
+    update_var "server_autodiscover" "$CONFIGFILE"
+    update_var "autodiscover_srv_query_string" "$CONFIGFILE"
+    update_var "autodiscover_a_query_string" "$CONFIGFILE"
 fi
 
 # Ask questions.
@@ -61,5 +64,8 @@
 db_input "$priority" $PACKAGE/computer_title || true
 db_input "$priority" $PACKAGE/account_name || true
 db_input "$priority" $PACKAGE/registration_password || true
+db_input "$priority" $PACKAGE/server_autodiscover || true
+db_input "$priority" $PACKAGE/autodiscover_srv_query_string || true
+db_input "$priority" $PACKAGE/autodiscover_a_query_string || true
 db_go || true
 
 
=== modified file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	2012-02-13 21:07:42 +0000
+++ debian/landscape-client.postinst	2012-02-24 01:18:21 +0000
@@ -56,6 +56,12 @@
             OTP="${RET}"
             db_get $PACKAGE/tags
             TAGS="${RET}"
+            db_get $PACKAGE/server_autodiscover
+            SERVER_AUTODISCOVER="${RET}"
+            db_get $PACKAGE/autodiscover_srv_query_string
+            AUTODISCOVER_SRV_QUERY_STRING="${RET}"
+            db_get $PACKAGE/autodiscover_a_query_string
+            AUTODISCOVER_A_QUERY_STRING="${RET}"
 
             # Create new configuration, with private mode
             TEMPFILE=$(mktemp -p /etc/landscape)
@@ -80,7 +86,10 @@
                 --http-proxy "$HTTP_PROXY" \
                 --https-proxy "$HTTPS_PROXY" \
                 --otp "$OTP" \
-                --tags "$TAGS"
+                --tags "$TAGS" \
+                --server-autodiscover "$SERVER_AUTODISCOVER" \
+                --autodiscover-srv-query-string "$AUTODISCOVER_SRV_QUERY_STRING" \
+                --autodiscover-a-query-string "$AUTODISCOVER_A_QUERY_STRING"
 
             # If we got the needed information, actually do the registration.
             if [ -n "$ACCOUNT_NAME" -a -n "$COMPUTER_TITLE" ]; then
 
=== modified file 'debian/landscape-client.templates'
--- debian/landscape-client.templates	2011-10-20 10:59:10 +0000
+++ debian/landscape-client.templates	2012-02-24 01:18:21 +0000
@@ -83,3 +83,25 @@
  Register this system with a preexisting Landscape account.  Please
   go to http://landscape.canonical.com if you need a Landscape account.
 
+Template: landscape-client/server_autodiscover
+Type: boolean
+Default: false
+_Description: Enable server autodiscovery?
+ Enable DNS searches to discover the hostname of a Landscape Dedicated
+ Server.
+
+Template: landscape-client/autodiscover_srv_query_string
+Type: string
+Default: _landscape._tcp.localdomain
+_Description: DNS SRV query string for discovering the server name:
+ When server autodiscovery is enabled, this string is used to make a
+ DNS SRV query to find the location of the Landscape server.  This
+ will override portions of the ping url and https url settings.
+
+Template: landscape-client/autodiscover_a_query_string
+Type: string
+Default: landscape.localdomain
+_Description: DNS A name query string for discovering the server name:
+ When server autodiscovery is enabled, this string is used to make a
+ DNS A name query to find the location of the Landscape server.  This
+ will override portions of the ping url and https url settings.