Merge ~cjwatson/launchpad-layers:incomplete-config-template into launchpad-layers:main

Proposed by Colin Watson
Status: Merged
Merged at revision: a8f4b28f245cad3296a328fe26d6b733fb6ab3ee
Proposed branch: ~cjwatson/launchpad-layers:incomplete-config-template
Merge into: launchpad-layers:main
Diff against target: 53 lines (+28/-0)
1 file modified
launchpad-base/templates/launchpad-base-lazr.conf (+28/-0)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+439704@code.launchpad.net

Commit message

Add many missing entries to launchpad-base-lazr.conf

Description of the change

I must have got distracted or something in the middle of writing this template originally, since there were quite a few entries in `config.yaml` that this layer was doing nothing with for no good reason.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) :
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 da168c7..e15c740 100644
3--- a/launchpad-base/templates/launchpad-base-lazr.conf
4+++ b/launchpad-base/templates/launchpad-base-lazr.conf
5@@ -71,9 +71,21 @@ is_demo: {{ is_demo }}
6 openid_provider_root: {{ openid_provider_root }}
7 {{- opt("site_message", site_message) }}
8
9+[launchpad_session]
10+cookie: {{ session_cookie_name }}
11+
12 [librarian]
13 authentication_endpoint: http://{{ domain_xmlrpc_private }}:{{ port_xmlrpc }}/authserver
14 {{- opt("download_host", librarian_download_host) }}
15+{{- opt("download_port", librarian_download_port) }}
16+{{- opt("download_url", librarian_download_url) }}
17+{{- opt("restricted_download_host", librarian_restricted_download_host) }}
18+{{- opt("restricted_download_port", librarian_restricted_download_port) }}
19+{{- opt("restricted_download_url", librarian_restricted_download_url) }}
20+{{- opt("restricted_upload_host", librarian_restricted_upload_host) }}
21+{{- opt("restricted_upload_port", librarian_restricted_upload_port) }}
22+{{- opt("upload_host", librarian_upload_host) }}
23+{{- opt("upload_port", librarian_upload_port) }}
24
25 [mailman]
26 {{- opt("build_host_name", domain_lists) }}
27@@ -81,6 +93,19 @@ authentication_endpoint: http://{{ domain_xmlrpc_private }}:{{ port_xmlrpc }}/au
28 [malone]
29 buglist_batch_size: {{ default_batch_size }}
30 bugmail_error_from_address: noreply@bugs.{{ domain }}
31+ubuntu_disable_filebug: {{ ubuntu_disable_filebug }}
32+
33+[oci]
34+{{- opt("registry_secrets_public_key", oci_registry_credentials_public_key) }}
35+
36+[personalpackagearchive]
37+base_url: {{ ppa_base_url }}
38+private_base_url: {{ ppa_private_base_url }}
39+
40+[snappy]
41+{{- opt("store_url", snap_store_url) }}
42+{{- opt("store_upload_url", snap_store_upload_url) }}
43+{{- opt("store_secrets_public_key", snap_store_secrets_public_key) }}
44
45 {%- if statsd_environment %}
46 [statsd]
47@@ -134,3 +159,6 @@ hostname: xmlrpc.{{ domain }}
48 [vhost.xmlrpc_private]
49 hostname: {{ domain_xmlrpc_private }}
50
51+[webhooks]
52+{{- opt("http_proxy", webhooks_proxy_url) }}
53+

Subscribers

People subscribed via source and target branches