launchpad-layers

Merge ~cjwatson/launchpad-layers:fix-set-role-after-connecting into launchpad-layers:main

  1. Git
  2. lp:~cjwatson/launchpad-layers
  3. fix-set-role-after-connecting
  4. Merge into main
Proposed by Colin Watson
Status: Merged
Merged at revision: 01a23c1cbc3d2cdf009f28a704f4d5f6a228c5b4
Proposed branch: ~cjwatson/launchpad-layers:fix-set-role-after-connecting
Merge into: launchpad-layers:main
Diff against target: 12 lines (+0/-1)
1 file modified
launchpad-base/templates/launchpad-base-lazr.conf (+0/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+439325@code.launchpad.net

Commit message

Stop setting launchpad.dbuser

Description of the change

Commit 819dd81912f69d759d72b294936c084ac227c18b removed `db_user` from the config dictionary, since we can now log in using the user in the connection string and switch to the appropriate role using `SET ROLE`; but I forgot to remove the corresponding line from the template.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Trivial.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/launchpad-base/templates/launchpad-base-lazr.conf b/launchpad-base/templates/launchpad-base-lazr.conf
2index 748aaa2..da168c7 100644
3--- a/launchpad-base/templates/launchpad-base-lazr.conf
4+++ b/launchpad-base/templates/launchpad-base-lazr.conf
5@@ -63,7 +63,6 @@ bugs_domain: bugs.{{ domain }}
6 {{- opt("candid_service_root", candid_service_root) }}
7 code_domain: code.{{ domain }}
8 config_overlay_dir: {{ secrets_dir }}
9-dbuser: {{ db_user }}
10 default_batch_size: {{ default_batch_size }}
11 {{- opt("geoip_database", geoip_database) }}
12 {{- opt("http_proxy", http_proxy) }}

Subscribers

People subscribed via source and target branches