Launchpad itself

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

  1. reorder_config_keys
  2. Merge into devel
Proposed by Māris Fogels
Status: Merged
Approved by: Gary Poster
Approved revision: no longer in the source branch.
Merged at revision: 10841
Proposed branch: lp:~mars/launchpad/reorder_config_keys
Merge into: lp:launchpad
Diff against target: 456 lines (+95/-80)
3 files modified
configs/development/launchpad-lazr.conf (+3/-3)
configs/testrunner/launchpad-lazr.conf (+3/-3)
lib/canonical/config/schema-lazr.conf (+89/-74)
To merge this branch: bzr merge lp:~mars/launchpad/reorder_config_keys
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Review via email: mp+24865@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

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.

Revision history for this message
Gary Poster (gary) wrote :

Thanks for the cleanup.

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configs/development/launchpad-lazr.conf'
2--- configs/development/launchpad-lazr.conf 2010-04-30 03:10:17 +0000
3+++ configs/development/launchpad-lazr.conf 2010-05-07 19:43:24 +0000
4@@ -25,6 +25,9 @@
5 [buildsequencer_job.slave_scanner]
6 mindelay: 10
7
8+[build_from_branch]
9+enabled = True
10+
11 [bzr_lpserve]
12 error_dir: /var/tmp/codehosting.test
13 oops_prefix: BZR
14@@ -317,6 +320,3 @@
15 # so disable that here. note that the testrunner config inherits
16 # this setting from us.
17 send_email: false
18-
19-[build_from_branch]
20-enabled = True
21
22=== modified file 'configs/testrunner/launchpad-lazr.conf'
23--- configs/testrunner/launchpad-lazr.conf 2010-04-23 22:45:59 +0000
24+++ configs/testrunner/launchpad-lazr.conf 2010-05-07 19:43:24 +0000
25@@ -25,6 +25,9 @@
26 [buildsequencer_job.slave_scanner]
27 mindelay: 5
28
29+[build_from_branch]
30+enabled = True
31+
32 [checkwatches]
33 sync_debbugs_comments: True
34 oops_prefix: TCW
35@@ -232,6 +235,3 @@
36
37 [zeca]
38 root: /var/tmp/zeca.test
39-
40-[build_from_branch]
41-enabled = True
42
43=== modified file 'lib/canonical/config/schema-lazr.conf'
44--- lib/canonical/config/schema-lazr.conf 2010-05-04 14:25:40 +0000
45+++ lib/canonical/config/schema-lazr.conf 2010-05-07 19:43:24 +0000
46@@ -1,3 +1,7 @@
47+#
48+# This file is ordered alphabetically. Please help keep it that way! -- mars
49+#
50+
51 [answertracker]
52 # The database user which will be used to expire questions.
53 # datatype: string
54@@ -29,22 +33,12 @@
55 base_url: http://ftpmaster.internal/
56 copy_base_url: http://rebuild-test.internal/
57
58-[calculate_bug_heat]
59-# The database user which will be used by this process.
60-# datatype: string
61-dbuser: calculate-bug-heat
62-oops_prefix: none
63-error_dir: none
64-copy_to_zlog: false
65-max_heat_age: 7
66-
67-[process_apport_blobs]
68-# The database user which will be used by this process.
69-# datatype: string
70-dbuser: process-apport-blobs
71-oops_prefix: APPORTBLOB
72-error_dir: none
73-copy_to_zlog: false
74+
75+[binaryfile_expire]
76+dbuser: binaryfile-expire
77+storm_cache: generational
78+storm_cache_size: 500
79+
80
81 [branchscanner]
82 # The database user which will be used by this process.
83@@ -146,7 +140,6 @@
84 # datatype: string
85 fromaddress: launchpad@lists.canonical.com
86
87-
88 [buildsequencer_job.template]
89 # The subprocess to run. You can assume LPCONFIG will be set
90 # and that PYTHONPATH will be set to include the launchpad/lib
91@@ -173,6 +166,10 @@
92 mindelay: 5
93
94
95+[build_from_branch]
96+enabled = False
97+
98+
99 # Configuration for spawned Bazaar subprocesses.
100 [bzr_lpserve]
101 # See [error_reports].
102@@ -183,6 +180,16 @@
103 copy_to_zlog: false
104
105
106+[calculate_bug_heat]
107+# The database user which will be used by this process.
108+# datatype: string
109+dbuser: calculate-bug-heat
110+oops_prefix: none
111+error_dir: none
112+copy_to_zlog: false
113+max_heat_age: 7
114+
115+
116 [canonical]
117 # datatype: boolean
118 chunkydiff: True
119@@ -248,6 +255,7 @@
120 bugzilla.mozilla.org.username: none
121 bugzilla.mozilla.org.password: none
122
123+
124 [codebrowse]
125 # Where to store codebrowse's sqlite "files changed" caches. If
126 # empty, the logs will be stored in a folder called 'logs' next to the
127@@ -412,6 +420,7 @@
128 # generate a diff for a merge proposal (in the UpdatePreviewDiffJob).
129 update_preview_diff_ready_timeout: 15
130
131+
132 [codeimport]
133 # Where the Bazaar imports are stored.
134 # datatype: string
135@@ -512,6 +521,7 @@
136 # See [error_reports].
137 oops_prefix: CIW
138
139+
140 [commercial]
141 # URL for salesforce proxy.
142 # datatype: string; a url
143@@ -621,6 +631,7 @@
144 # datatype: integer
145 storm_cache_size: 500
146
147+
148 [diff]
149 # The maximum size in bytes to read from the librarian to make available in
150 # the web UI. 512k == 524288 bytes.
151@@ -683,6 +694,12 @@
152 storm_cache_size: 500
153
154
155+[generateppahtaccess]
156+dbuser: generateppahtaccess
157+storm_cache: generational
158+storm_cache_size: 500
159+
160+
161 [gina]
162 # The database user which will be used by this process.
163 # datatype: string
164@@ -886,6 +903,7 @@
165 # datatype: integer
166 max_scaling: 500
167
168+
169 [launchpad]
170 # The database user which will be used by this process.
171 # datatype: string
172@@ -1113,6 +1131,7 @@
173 # ba-ws.geonames.net.
174 geonames_identity:
175
176+
177 [launchpad_session]
178 # The hostname where the session database is located.
179 # If the value is empty or None, localhost via UNIX sockets
180@@ -1194,6 +1213,7 @@
181
182 use_https = True
183
184+
185 [librarian_gc]
186 # The database user which will be used by this process.
187 # datatype: string
188@@ -1410,6 +1430,7 @@
189 # datatype: string
190 servers: (127.0.0.1:11217,1)
191
192+
193 [memcached]
194 # If True, launch a local memcached instance.
195 # datatype: boolean
196@@ -1444,6 +1465,7 @@
197 # See [error_reports].
198 copy_to_zlog: false
199
200+
201 ##
202 ## TODO: delete mpcreationjobs section after 10.04 rollout.
203 ##
204@@ -1463,33 +1485,6 @@
205 # See [error_reports].
206 copy_to_zlog: false
207
208-##
209-## TODO: delete update_preview_diffs section after 10.04 rollout.
210-##
211-[update_preview_diffs]
212-dbuser: update-preview-diffs
213-
214-# See [error_reports].
215-error_dir: none
216-
217-# See [error_reports].
218-oops_prefix: none
219-
220-# See [error_reports].
221-copy_to_zlog: false
222-
223-
224-[upgrade_branches]
225-dbuser: upgrade-branches
226-
227-# See [error_reports].
228-error_dir: none
229-
230-# See [error_reports].
231-oops_prefix: none
232-
233-# See [error_reports].
234-copy_to_zlog: false
235
236 [person_notification]
237 # User for person notification db access
238@@ -1500,6 +1495,7 @@
239 # datatype: integer
240 retained_days: 366
241
242+
243 [personalpackagearchive]
244 # Directory to be created to store PPAs.
245 # datatype: string
246@@ -1524,9 +1520,11 @@
247
248 [ppa.master]
249
250+
251 [ppa_apache_log_parser]
252 logs_root: /srv/ppa.launchpad.net-logs
253
254+
255 [poimport]
256 # The database user which will be used by this process.
257 # datatype: string
258@@ -1545,6 +1543,7 @@
259 # See [error_reports].
260 copy_to_zlog: false
261
262+
263 [processmail]
264 # The database user which will be used by this process.
265 # datatype: string
266@@ -1552,6 +1551,16 @@
267 storm_cache: generational
268 storm_cache_size: 500
269
270+
271+[process_apport_blobs]
272+# The database user which will be used by this process.
273+# datatype: string
274+dbuser: process-apport-blobs
275+oops_prefix: APPORTBLOB
276+error_dir: none
277+copy_to_zlog: false
278+
279+
280 [productreleasefinder]
281 # The database user which will be used by this process.
282 # datatype: string
283@@ -1559,6 +1568,7 @@
284 storm_cache: generational
285 storm_cache_size: 500
286
287+
288 [profiling]
289 # When set to True, each requests will be profiled and the resulting data
290 # saved in profile_dir.
291@@ -1575,6 +1585,7 @@
292 # datatype: filename
293 memory_profile_log:
294
295+
296 [reclaimbranchspace]
297 # The database user which will be used by this process.
298 # datatype: string
299@@ -1589,6 +1600,7 @@
300 # See [error_reports].
301 copy_to_zlog: false
302
303+
304 [revisionkarma]
305 # The database user which will be used by this process.
306 # datatype: string
307@@ -1634,6 +1646,7 @@
308 # Number of seconds each LoopTuner iteration should take.
309 looptuner_iteration_duration = 4
310
311+
312 [rosettabranches]
313 # The database user which will be used by the rosetta-branches cronscript.
314 # datatype: string
315@@ -1650,6 +1663,7 @@
316 # See [error_reports].
317 copy_to_zlog: false
318
319+
320 [sendbranchmail]
321 # The database user which will be used by this process.
322 # datatype: string
323@@ -1784,6 +1798,7 @@
324 storm_cache: generational
325 storm_cache_size: 500
326
327+
328 [updatesourceforgeremoteproduct]
329 # The database user to run this process as.
330 # datatype: string
331@@ -1791,6 +1806,36 @@
332 storm_cache: generational
333 storm_cache_size: 500
334
335+
336+##
337+## TODO: delete update_preview_diffs section after 10.04 rollout.
338+##
339+[update_preview_diffs]
340+dbuser: update-preview-diffs
341+
342+# See [error_reports].
343+error_dir: none
344+
345+# See [error_reports].
346+oops_prefix: none
347+
348+# See [error_reports].
349+copy_to_zlog: false
350+
351+
352+[upgrade_branches]
353+dbuser: upgrade-branches
354+
355+# See [error_reports].
356+error_dir: none
357+
358+# See [error_reports].
359+oops_prefix: none
360+
361+# See [error_reports].
362+copy_to_zlog: false
363+
364+
365 [uploader]
366 # The database user which will be used by this process.
367 # datatype: string
368@@ -1819,23 +1864,12 @@
369 storm_cache_size: 500
370
371
372-[binaryfile_expire]
373-dbuser: binaryfile-expire
374-storm_cache: generational
375-storm_cache_size: 500
376-
377-[generateppahtaccess]
378-dbuser: generateppahtaccess
379-storm_cache: generational
380-storm_cache_size: 500
381-
382 [vhosts]
383 # When true, use https URLs unless explicitly overridden.
384 # When false, use http URLs unless explicitly overridden.
385 # datatype: boolean
386 use_https: True
387
388-
389 [vhost.template]
390 # Host name of this virtual host.
391 # This is matched from the incoming Host header, and
392@@ -1857,57 +1891,41 @@
393 # datatype: string
394 rooturl: none
395
396-
397 [vhost.mainsite]
398 # Can the profile page act as a OpenID delegated identity?
399 # data-type: boolean
400 openid_delegate_profile: False
401
402-
403 [vhost.api]
404 # This key should be removed once the production configs have been updated.
405 beta_test_team: disabled
406
407-
408 [vhost.blueprints]
409
410-
411 [vhost.code]
412
413-
414 [vhost.translations]
415
416-
417 [vhost.bugs]
418
419-
420 [vhost.answers]
421
422-
423 [vhost.openid]
424
425-
426 [vhost.testopenid]
427
428-
429 [vhost.ubuntu_openid]
430
431-
432 [vhost.shipitubuntu]
433
434-
435 [vhost.shipitkubuntu]
436
437-
438 [vhost.shipitedubuntu]
439
440-
441 [vhost.xmlrpc]
442
443-
444 [vhost.xmlrpc_private.optional]
445
446-
447 [vhost.feeds]
448
449
450@@ -1932,6 +1950,3 @@
451
452 # datatype: boolean
453 send_email: true
454-
455-[build_from_branch]
456-enabled = False