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
=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf 2016-10-12 13:35:48 +0000
+++ configs/development/launchpad-lazr.conf 2017-09-07 13:26:50 +0000
@@ -83,7 +83,6 @@
83# Development and the testrunner should use the stub service be default.83# Development and the testrunner should use the stub service be default.
84site: http://launchpad.dev:8092/cse84site: http://launchpad.dev:8092/cse
85client_id: ABCDEF232385client_id: ABCDEF2323
86maps_api_key: ABQIAAAAd8GIgO6pcskVE20WMo0tMRTWrrsyo_91eNrAe8_Mod2l0UnqlRSKiPprMSOGPJIjYKODQzeFQPz5Dg
8786
88[google_test_service]87[google_test_service]
89launch: True88launch: True
@@ -107,7 +106,6 @@
107max_bug_feed_cache_minutes: 30106max_bug_feed_cache_minutes: 30
108bzr_imports_root_url: file:///tmp/bazaar-branches107bzr_imports_root_url: file:///tmp/bazaar-branches
109geoip_database: /usr/share/GeoIP/GeoLiteCity.dat108geoip_database: /usr/share/GeoIP/GeoLiteCity.dat
110geonames_identity: lpdev
111feature_flags_endpoint: http://xmlrpc-private.launchpad.dev:8087/featureflags/109feature_flags_endpoint: http://xmlrpc-private.launchpad.dev:8087/featureflags/
112110
113[launchpad_session]111[launchpad_session]
114112
=== modified file 'lib/lp/services/config/schema-lazr.conf'
--- lib/lp/services/config/schema-lazr.conf 2017-06-29 05:45:36 +0000
+++ lib/lp/services/config/schema-lazr.conf 2017-09-07 13:26:50 +0000
@@ -796,13 +796,6 @@
796# Example: help.launchpad.net login.launchapd.net796# Example: help.launchpad.net login.launchapd.net
797url_rewrite_exceptions: help.launchpad.net797url_rewrite_exceptions: help.launchpad.net
798798
799# maps_api_key is the API key we use for Google Maps. Values for the API
800# keys are documented in lib/canonical/launchpad/google.txt
801# The default value is the key for the launchpad.net domain, so we only
802# need to override it when running in dev mode.
803# datatype: string
804maps_api_key:
805
806[gpghandler]799[gpghandler]
807# Should we allow uploading keys to the keyserver?800# Should we allow uploading keys to the keyserver?
808# datatype: boolean801# datatype: boolean
@@ -1070,10 +1063,6 @@
1070# The database used by our GeoIP library.1063# The database used by our GeoIP library.
1071geoip_database: /usr/share/GeoIP/GeoIPCity.dat1064geoip_database: /usr/share/GeoIP/GeoIPCity.dat
10721065
1073# The identity used to do remote geo to time zone lookups at
1074# ba-ws.geonames.net.
1075geonames_identity:
1076
1077# The maximum number of lines that should be parsed by the launchpad1066# The maximum number of lines that should be parsed by the launchpad
1078# log parser. The default value of None means there is no maximum.1067# log parser. The default value of None means there is no maximum.
1079logparser_max_parsed_lines: None1068logparser_max_parsed_lines: None