Merge lp:~wgrant/launchpad/restore-archivepublisher-config into lp:launchpad/db-devel

Proposed by William Grant
Status: Merged
Merged at revision: 10334
Proposed branch: lp:~wgrant/launchpad/restore-archivepublisher-config
Merge into: lp:launchpad/db-devel
Diff against target: 16 lines (+6/-0)
1 file modified
lib/canonical/config/schema-lazr.conf (+6/-0)
To merge this branch: bzr merge lp:~wgrant/launchpad/restore-archivepublisher-config
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) code Approve
Review via email: mp+54301@code.launchpad.net

Commit message

[r=jtv][no-qa] Restore archivepublisher.{root,base_url,copy_base_url}, making db-devel deployable without lockstep config changes.

Description of the change

db-devel is missing some archivepublisher config keys that are in the prod configs. This branch revives them, easing deployments until we remove them from the production configs after 11.04.

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/config/schema-lazr.conf'
2--- lib/canonical/config/schema-lazr.conf 2011-03-14 16:24:32 +0000
3+++ lib/canonical/config/schema-lazr.conf 2011-03-22 06:58:30 +0000
4@@ -24,6 +24,12 @@
5 # datatype: string
6 dbuser: archivepublisher
7
8+# XXX: wgrant 2011-03-22 bug=739992: These three keys are obsolete and
9+# should be removed after 11.04 is released.
10+root: none
11+base_url: none
12+copy_base_url: none
13+
14
15 [binaryfile_expire]
16 dbuser: binaryfile-expire

Subscribers

People subscribed via source and target branches

to status/vote changes: