Merge lp:~mars/launchpad/reorder_config_keys into lp:launchpad

[Māris Fogels]

Put the config sections in schema-lazr.conf back in alphabetical order.

Hi,

This branch puts the sections of the launchpad configuration files under configs/ back into alphabetical order. It also adds a nice reminder to the top of schema-lazr.conf asking people to help preserve it.

Test command: ec2 land

Maris

[Robert Collins (lifeless)]

I have a suggestion for you - write a small merge plugin for bzr to
maintain this in alphabetical order for you. I'd be delighted to help
you do this; it seems like it would reduce some overhead for you.

[Gary Poster (gary)]

Thanks for the cleanup.

Merge plugin might be fun. I'm not sure how valuable it would be.

review: Approve

=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf	2010-04-30 03:10:17 +0000
+++ configs/development/launchpad-lazr.conf	2010-05-07 19:43:24 +0000
@@ -25,6 +25,9 @@
 [buildsequencer_job.slave_scanner]
 mindelay: 10
 
+[build_from_branch]
+enabled = True
+
 [bzr_lpserve]
 error_dir: /var/tmp/codehosting.test
 oops_prefix: BZR
@@ -317,6 +320,3 @@
 # so disable that here. note that the testrunner config inherits
 # this setting from us.
 send_email: false
-
-[build_from_branch]
-enabled = True

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf	2010-04-23 22:45:59 +0000
+++ configs/testrunner/launchpad-lazr.conf	2010-05-07 19:43:24 +0000
@@ -25,6 +25,9 @@
 [buildsequencer_job.slave_scanner]
 mindelay: 5
 
+[build_from_branch]
+enabled = True
+
 [checkwatches]
 sync_debbugs_comments: True
 oops_prefix: TCW
@@ -232,6 +235,3 @@
 
 [zeca]
 root: /var/tmp/zeca.test
-
-[build_from_branch]
-enabled = True

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-05-04 14:25:40 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-05-07 19:43:24 +0000
@@ -1,3 +1,7 @@
+#
+# This file is ordered alphabetically.  Please help keep it that way! -- mars
+#
+
 [answertracker]
 # The database user which will be used to expire questions.
 # datatype: string
@@ -29,22 +33,12 @@
 base_url: http://ftpmaster.internal/
 copy_base_url: http://rebuild-test.internal/
 
-[calculate_bug_heat]
-# The database user which will be used by this process.
-# datatype: string
-dbuser: calculate-bug-heat
-oops_prefix: none
-error_dir: none
-copy_to_zlog: false
-max_heat_age: 7
-
-[process_apport_blobs]
-# The database user which will be used by this process.
-# datatype: string
-dbuser: process-apport-blobs
-oops_prefix: APPORTBLOB
-error_dir: none
-copy_to_zlog: false
+
+[binaryfile_expire]
+dbuser: binaryfile-expire
+storm_cache: generational
+storm_cache_size: 500
+
 
 [branchscanner]
 # The database user which will be used by this process.
@@ -146,7 +140,6 @@
 # datatype: string
 fromaddress: [e-mail]
 
-
 [buildsequencer_job.template]
 # The subprocess to run. You can assume LPCONFIG will be set
 # and that PYTHONPATH will be set to include the launchpad/lib
@@ -173,6 +166,10 @@
 mindelay: 5
 
 
+[build_from_branch]
+enabled = False
+
+
 # Configuration for spawned Bazaar subprocesses.
 [bzr_lpserve]
 # See [error_reports].
@@ -183,6 +180,16 @@
 copy_to_zlog: false
 
 
+[calculate_bug_heat]
+# The database user which will be used by this process.
+# datatype: string
+dbuser: calculate-bug-heat
+oops_prefix: none
+error_dir: none
+copy_to_zlog: false
+max_heat_age: 7
+
+
 [canonical]
 # datatype: boolean
 chunkydiff: True
@@ -248,6 +255,7 @@
 bugzilla.mozilla.org.username: none
 bugzilla.mozilla.org.password: none
 
+
 [codebrowse]
 # Where to store codebrowse's sqlite "files changed" caches.  If
 # empty, the logs will be stored in a folder called 'logs' next to the
@@ -412,6 +420,7 @@
 # generate a diff for a merge proposal (in the UpdatePreviewDiffJob).
 update_preview_diff_ready_timeout: 15
 
+
 [codeimport]
 # Where the Bazaar imports are stored.
 # datatype: string
@@ -512,6 +521,7 @@
 # See [error_reports].
 oops_prefix: CIW
 
+
 [commercial]
 # URL for salesforce proxy.
 # datatype: string; a url
@@ -621,6 +631,7 @@
 # datatype: integer
 storm_cache_size: 500
 
+
 [diff]
 # The maximum size in bytes to read from the librarian to make available in
 # the web UI.  512k == 524288 bytes.
@@ -683,6 +694,12 @@
 storm_cache_size: 500
 
 
+[generateppahtaccess]
+dbuser: generateppahtaccess
+storm_cache: generational
+storm_cache_size: 500
+
+
 [gina]
 # The database user which will be used by this process.
 # datatype: string
@@ -886,6 +903,7 @@
 # datatype: integer
 max_scaling: 500
 
+
 [launchpad]
 # The database user which will be used by this process.
 # datatype: string
@@ -1113,6 +1131,7 @@
 # ba-ws.geonames.net.
 geonames_identity:
 
+
 [launchpad_session]
 # The hostname where the session database is located.
 # If the value is empty or None, localhost via UNIX sockets
@@ -1194,6 +1213,7 @@
 
 use_https = True
 
+
 [librarian_gc]
 # The database user which will be used by this process.
 # datatype: string
@@ -1410,6 +1430,7 @@
 # datatype: string
 servers: (127.0.0.1:11217,1)
 
+
 [memcached]
 # If True, launch a local memcached instance.
 # datatype: boolean
@@ -1444,6 +1465,7 @@
 # See [error_reports].
 copy_to_zlog: false
 
+
 ##
 ## TODO: delete mpcreationjobs section after 10.04 rollout.
 ##
@@ -1463,33 +1485,6 @@
 # See [error_reports].
 copy_to_zlog: false
 
-##
-## TODO: delete update_preview_diffs section after 10.04 rollout.
-##
-[update_preview_diffs]
-dbuser: update-preview-diffs
-
-# See [error_reports].
-error_dir: none
-
-# See [error_reports].
-oops_prefix: none
-
-# See [error_reports].
-copy_to_zlog: false
-
-
-[upgrade_branches]
-dbuser: upgrade-branches
-
-# See [error_reports].
-error_dir: none
-
-# See [error_reports].
-oops_prefix: none
-
-# See [error_reports].
-copy_to_zlog: false
 
 [person_notification]
 # User for person notification db access
@@ -1500,6 +1495,7 @@
 # datatype: integer
 retained_days: 366
 
+
 [personalpackagearchive]
 # Directory to be created to store PPAs.
 # datatype: string
@@ -1524,9 +1520,11 @@
 
 [ppa.master]
 
+
 [ppa_apache_log_parser]
 logs_root: /srv/ppa.launchpad.net-logs
 
+
 [poimport]
 # The database user which will be used by this process.
 # datatype: string
@@ -1545,6 +1543,7 @@
 # See [error_reports].
 copy_to_zlog: false
 
+
 [processmail]
 # The database user which will be used by this process.
 # datatype: string
@@ -1552,6 +1551,16 @@
 storm_cache: generational
 storm_cache_size: 500
 
+
+[process_apport_blobs]
+# The database user which will be used by this process.
+# datatype: string
+dbuser: process-apport-blobs
+oops_prefix: APPORTBLOB
+error_dir: none
+copy_to_zlog: false
+
+
 [productreleasefinder]
 # The database user which will be used by this process.
 # datatype: string
@@ -1559,6 +1568,7 @@
 storm_cache: generational
 storm_cache_size: 500
 
+
 [profiling]
 # When set to True, each requests will be profiled and the resulting data
 # saved in profile_dir.
@@ -1575,6 +1585,7 @@
 # datatype: filename
 memory_profile_log:
 
+
 [reclaimbranchspace]
 # The database user which will be used by this process.
 # datatype: string
@@ -1589,6 +1600,7 @@
 # See [error_reports].
 copy_to_zlog: false
 
+
 [revisionkarma]
 # The database user which will be used by this process.
 # datatype: string
@@ -1634,6 +1646,7 @@
 # Number of seconds each LoopTuner iteration should take.
 looptuner_iteration_duration = 4
 
+
 [rosettabranches]
 # The database user which will be used by the rosetta-branches cronscript.
 # datatype: string
@@ -1650,6 +1663,7 @@
 # See [error_reports].
 copy_to_zlog: false
 
+
 [sendbranchmail]
 # The database user which will be used by this process.
 # datatype: string
@@ -1784,6 +1798,7 @@
 storm_cache: generational
 storm_cache_size: 500
 
+
 [updatesourceforgeremoteproduct]
 # The database user to run this process as.
 # datatype: string
@@ -1791,6 +1806,36 @@
 storm_cache: generational
 storm_cache_size: 500
 
+
+##
+## TODO: delete update_preview_diffs section after 10.04 rollout.
+##
+[update_preview_diffs]
+dbuser: update-preview-diffs
+
+# See [error_reports].
+error_dir: none
+
+# See [error_reports].
+oops_prefix: none
+
+# See [error_reports].
+copy_to_zlog: false
+
+
+[upgrade_branches]
+dbuser: upgrade-branches
+
+# See [error_reports].
+error_dir: none
+
+# See [error_reports].
+oops_prefix: none
+
+# See [error_reports].
+copy_to_zlog: false
+
+
 [uploader]
 # The database user which will be used by this process.
 # datatype: string
@@ -1819,23 +1864,12 @@
 storm_cache_size: 500
 
 
-[binaryfile_expire]
-dbuser: binaryfile-expire
-storm_cache: generational
-storm_cache_size: 500
-
-[generateppahtaccess]
-dbuser: generateppahtaccess
-storm_cache: generational
-storm_cache_size: 500
-
 [vhosts]
 # When true, use https URLs unless explicitly overridden.
 # When false, use http URLs unless explicitly overridden.
 # datatype: boolean
 use_https: True
 
-
 [vhost.template]
 # Host name of this virtual host.
 # This is matched from the incoming Host header, and
@@ -1857,57 +1891,41 @@
 # datatype: string
 rooturl: none
 
-
 [vhost.mainsite]
 # Can the profile page act as a OpenID delegated identity?
 # data-type: boolean
 openid_delegate_profile: False
 
-
 [vhost.api]
 # This key should be removed once the production configs have been updated.
 beta_test_team: disabled
 
-
 [vhost.blueprints]
 
-
 [vhost.code]
 
-
 [vhost.translations]
 
-
 [vhost.bugs]
 
-
 [vhost.answers]
 
-
 [vhost.openid]
 
-
 [vhost.testopenid]
 
-
 [vhost.ubuntu_openid]
 
-
 [vhost.shipitubuntu]
 
-
 [vhost.shipitkubuntu]
 
-
 [vhost.shipitedubuntu]
 
-
 [vhost.xmlrpc]
 
-
 [vhost.xmlrpc_private.optional]
 
-
 [vhost.feeds]
 
 
@@ -1932,6 +1950,3 @@
 
 # datatype: boolean
 send_email: true
-
-[build_from_branch]
-enabled = False