← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Colin Watson has proposed merging ~cjwatson/launchpad-layers:incomplete-config-template into launchpad-layers:main.

Commit message:
Add many missing entries to launchpad-base-lazr.conf

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-layers/+git/launchpad-layers/+merge/439704

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-layers:incomplete-config-template into launchpad-layers:main.
diff --git a/launchpad-base/templates/launchpad-base-lazr.conf b/launchpad-base/templates/launchpad-base-lazr.conf
index da168c7..e15c740 100644
--- a/launchpad-base/templates/launchpad-base-lazr.conf
+++ b/launchpad-base/templates/launchpad-base-lazr.conf
@@ -71,9 +71,21 @@ is_demo: {{ is_demo }}
 openid_provider_root: {{ openid_provider_root }}
 {{- opt("site_message", site_message) }}
 
+[launchpad_session]
+cookie: {{ session_cookie_name }}
+
 [librarian]
 authentication_endpoint: http://{{ domain_xmlrpc_private }}:{{ port_xmlrpc }}/authserver
 {{- opt("download_host", librarian_download_host) }}
+{{- opt("download_port", librarian_download_port) }}
+{{- opt("download_url", librarian_download_url) }}
+{{- opt("restricted_download_host", librarian_restricted_download_host) }}
+{{- opt("restricted_download_port", librarian_restricted_download_port) }}
+{{- opt("restricted_download_url", librarian_restricted_download_url) }}
+{{- opt("restricted_upload_host", librarian_restricted_upload_host) }}
+{{- opt("restricted_upload_port", librarian_restricted_upload_port) }}
+{{- opt("upload_host", librarian_upload_host) }}
+{{- opt("upload_port", librarian_upload_port) }}
 
 [mailman]
 {{- opt("build_host_name", domain_lists) }}
@@ -81,6 +93,19 @@ authentication_endpoint: http://{{ domain_xmlrpc_private }}:{{ port_xmlrpc }}/au
 [malone]
 buglist_batch_size: {{ default_batch_size }}
 bugmail_error_from_address: noreply@bugs.{{ domain }}
+ubuntu_disable_filebug: {{ ubuntu_disable_filebug }}
+
+[oci]
+{{- opt("registry_secrets_public_key", oci_registry_credentials_public_key) }}
+
+[personalpackagearchive]
+base_url: {{ ppa_base_url }}
+private_base_url: {{ ppa_private_base_url }}
+
+[snappy]
+{{- opt("store_url", snap_store_url) }}
+{{- opt("store_upload_url", snap_store_upload_url) }}
+{{- opt("store_secrets_public_key", snap_store_secrets_public_key) }}
 
 {%- if statsd_environment %}
 [statsd]
@@ -134,3 +159,6 @@ hostname: xmlrpc.{{ domain }}
 [vhost.xmlrpc_private]
 hostname: {{ domain_xmlrpc_private }}
 
+[webhooks]
+{{- opt("http_proxy", webhooks_proxy_url) }}
+