launchpad-reviewers team mailing list archive

[Robie Basak <robie.basak@xxxxxxxxxxxxx>]

Robie Basak has proposed merging lp:~racb/maas/auto-authbind into lp:maas.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~racb/maas/auto-authbind/+merge/124705


-- 
https://code.launchpad.net/~racb/maas/auto-authbind/+merge/124705
Your team MAAS Maintainers is requested to review the proposed merge of lp:~racb/maas/auto-authbind into lp:maas.

=== modified file 'HACKING.txt'
--- HACKING.txt	2012-08-21 10:56:22 +0000
+++ HACKING.txt	2012-09-17 14:41:21 +0000
@@ -244,9 +244,8 @@
       $ sudo touch /etc/authbind/byport/69
       $ sudo chmod a+x /etc/authbind/byport/69
 
-Now when starting up the MAAS development webserver, do it like this::
-
-    $ authbind --deep make run
+Now when starting up the MAAS development webserver, "make run" and "make
+start" will detect authbind's presence and use it automatically.
 
 
 Running the BIND daemon for real
@@ -264,7 +263,7 @@
     $ sudo touch /etc/authbind/byport/53
     $ sudo chmod a+x /etc/authbind/byport/53
 
-and run as for TFTP.
+and run as normal.
 
 
 Configuring DHCP

=== modified file 'services/dns/run'
--- services/dns/run	2012-08-13 09:58:50 +0000
+++ services/dns/run	2012-09-17 14:41:21 +0000
@@ -27,6 +27,11 @@
 ./bin/maas get_named_conf --edit --config_path \
     `pwd`/run/named/named.conf
 # Run named.
-exec bin/py -m maastesting.bindfixture -- \
+if [ -x /usr/bin/authbind ]; then
+    authbind="/usr/bin/authbind --deep"
+else
+    authbind=
+fi
+exec $authbind bin/py -m maastesting.bindfixture -- \
     --homedir $homedir \
     --port $port --rndc-port $rndc_port

=== modified file 'services/pserv/run'
--- services/pserv/run	2012-04-20 13:30:42 +0000
+++ services/pserv/run	2012-09-17 14:41:21 +0000
@@ -17,4 +17,9 @@
 # Exec the Provisioning Server.
 script="$(readlink -f bin/twistd.pserv)"
 config="$(readlink -f etc/pserv.yaml)"
-exec "${script}" --nodaemon --pidfile="" maas-pserv --config-file "${config}"
+if [ -x /usr/bin/authbind ]; then
+    authbind="/usr/bin/authbind --deep"
+else
+    authbind=
+fi
+exec $authbind "${script}" --nodaemon --pidfile="" maas-pserv --config-file "${config}"