[MediaWiki-commits] [Gerrit] operations/puppet[production]: Prep varnishd for libmaxminddb-based VCL
BBlack has submitted this change and it was merged. Change subject: Prep varnishd for libmaxminddb-based VCL .. Prep varnishd for libmaxminddb-based VCL Splitting this from the actual VCL change makes transition simpler: we can restart all frontends with the new flags, then selectively test/deploy the actual VCL change while both libs are enabled. Bug: T99226 Change-Id: If82dc25425ea754c8fb4d44e3b4a4a32a077799a --- M modules/geoip/manifests/dev.pp M modules/varnish/templates/initscripts/varnish.systemd.erb 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/geoip/manifests/dev.pp b/modules/geoip/manifests/dev.pp index 64f1eae..a943c89 100644 --- a/modules/geoip/manifests/dev.pp +++ b/modules/geoip/manifests/dev.pp @@ -2,7 +2,7 @@ # Installs the MaxMind library headers # class geoip::dev { - package { 'libgeoip-dev': -ensure => present, - } +package { [ 'libgeoip-dev', 'libmaxminddb-dev' ]: +ensure => present, +} } diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb b/modules/varnish/templates/initscripts/varnish.systemd.erb index f43524a..770c1d5 100644 --- a/modules/varnish/templates/initscripts/varnish.systemd.erb +++ b/modules/varnish/templates/initscripts/varnish.systemd.erb @@ -9,7 +9,7 @@ Restart=on-failure KillMode=process <% if @vcl_config.fetch("enable_geoiplookup", false) -%> -Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o %%s -lGeoIP" +Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o %%s -lmaxminddb -lGeoIP" <% end -%> <% if @jemalloc_conf -%> Environment="MALLOC_CONF=<%= @jemalloc_conf %>" -- To view, visit https://gerrit.wikimedia.org/r/305647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If82dc25425ea754c8fb4d44e3b4a4a32a077799a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack Gerrit-Reviewer: BBlack Gerrit-Reviewer: Ema Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Prep varnishd for libmaxminddb-based VCL
BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/305647 Change subject: Prep varnishd for libmaxminddb-based VCL .. Prep varnishd for libmaxminddb-based VCL Splitting this from the actual VCL change makes transition simpler: we can restart all frontends with the new flags, then selectively test/deploy the actual VCL change while both libs are enabled. Bug: T99226 Change-Id: If82dc25425ea754c8fb4d44e3b4a4a32a077799a --- M modules/geoip/manifests/dev.pp M modules/varnish/templates/initscripts/varnish.systemd.erb 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/305647/1 diff --git a/modules/geoip/manifests/dev.pp b/modules/geoip/manifests/dev.pp index 64f1eae..a943c89 100644 --- a/modules/geoip/manifests/dev.pp +++ b/modules/geoip/manifests/dev.pp @@ -2,7 +2,7 @@ # Installs the MaxMind library headers # class geoip::dev { - package { 'libgeoip-dev': -ensure => present, - } +package { [ 'libgeoip-dev', 'libmaxminddb-dev' ]: +ensure => present, +} } diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb b/modules/varnish/templates/initscripts/varnish.systemd.erb index f43524a..770c1d5 100644 --- a/modules/varnish/templates/initscripts/varnish.systemd.erb +++ b/modules/varnish/templates/initscripts/varnish.systemd.erb @@ -9,7 +9,7 @@ Restart=on-failure KillMode=process <% if @vcl_config.fetch("enable_geoiplookup", false) -%> -Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o %%s -lGeoIP" +Environment="CC_COMMAND=exec cc -fpic -shared -Wl,-x -L/usr/local/lib/ -o %%o %%s -lmaxminddb -lGeoIP" <% end -%> <% if @jemalloc_conf -%> Environment="MALLOC_CONF=<%= @jemalloc_conf %>" -- To view, visit https://gerrit.wikimedia.org/r/305647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If82dc25425ea754c8fb4d44e3b4a4a32a077799a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits