Launchpad itself

Merge lp:~cjwatson/launchpad/remove-geonames-identity into lp:launchpad

  1. remove-geonames-identity
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18457
Proposed branch: lp:~cjwatson/launchpad/remove-geonames-identity
Merge into: lp:launchpad
Diff against target: 48 lines (+0/-13)
2 files modified
configs/development/launchpad-lazr.conf (+0/-2)
lib/lp/services/config/schema-lazr.conf (+0/-11)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-geonames-identity
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+330355@code.launchpad.net

Commit message

Remove unused google.maps_api_key and launchpad.geonames_identity configuration keys.

Description of the change

I removed these from lp-production-configs a while ago (https://code.launchpad.net/~cjwatson/lp-production-configs/remove-geonames-identity/+merge/324537).

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

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 2016-10-12 13:35:48 +0000
3+++ configs/development/launchpad-lazr.conf 2017-09-07 13:26:50 +0000
4@@ -83,7 +83,6 @@
5 # Development and the testrunner should use the stub service be default.
6 site: http://launchpad.dev:8092/cse
7 client_id: ABCDEF2323
8-maps_api_key: ABQIAAAAd8GIgO6pcskVE20WMo0tMRTWrrsyo_91eNrAe8_Mod2l0UnqlRSKiPprMSOGPJIjYKODQzeFQPz5Dg
9
10 [google_test_service]
11 launch: True
12@@ -107,7 +106,6 @@
13 max_bug_feed_cache_minutes: 30
14 bzr_imports_root_url: file:///tmp/bazaar-branches
15 geoip_database: /usr/share/GeoIP/GeoLiteCity.dat
16-geonames_identity: lpdev
17 feature_flags_endpoint: http://xmlrpc-private.launchpad.dev:8087/featureflags/
18
19 [launchpad_session]
20
21=== modified file 'lib/lp/services/config/schema-lazr.conf'
22--- lib/lp/services/config/schema-lazr.conf 2017-06-29 05:45:36 +0000
23+++ lib/lp/services/config/schema-lazr.conf 2017-09-07 13:26:50 +0000
24@@ -796,13 +796,6 @@
25 # Example: help.launchpad.net login.launchapd.net
26 url_rewrite_exceptions: help.launchpad.net
27
28-# maps_api_key is the API key we use for Google Maps. Values for the API
29-# keys are documented in lib/canonical/launchpad/google.txt
30-# The default value is the key for the launchpad.net domain, so we only
31-# need to override it when running in dev mode.
32-# datatype: string
33-maps_api_key:
34-
35 [gpghandler]
36 # Should we allow uploading keys to the keyserver?
37 # datatype: boolean
38@@ -1070,10 +1063,6 @@
39 # The database used by our GeoIP library.
40 geoip_database: /usr/share/GeoIP/GeoIPCity.dat
41
42-# The identity used to do remote geo to time zone lookups at
43-# ba-ws.geonames.net.
44-geonames_identity:
45-
46 # The maximum number of lines that should be parsed by the launchpad
47 # log parser. The default value of None means there is no maximum.
48 logparser_max_parsed_lines: None