Faidon Liambotis has submitted this change and it was merged.
Change subject: puppetmaster/geoip: make the symlinks relative
......................................................................
puppetmaster/geoip: make the symlinks relative
Change-Id: I9b6938828a39d1b717db347c4ad72b79c81dbe74
---
M modules/puppetmaster/manifests/geoip.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/puppetmaster/manifests/geoip.pp
b/modules/puppetmaster/manifests/geoip.pp
index ea1f737..2d3a91d 100644
--- a/modules/puppetmaster/manifests/geoip.pp
+++ b/modules/puppetmaster/manifests/geoip.pp
@@ -18,14 +18,15 @@
}
if $is_labs_puppet_master {
- # compatibility symlinks
+ # compatibility symlinks, so that users can use the stable paths
+ # GeoIP.dat/GeoIPCity.dat between labs and production
file { "$geoip_destdir/GeoIP.dat":
ensure => link,
- target => "$geoip_destdir/GeoLite.dat",
+ target => 'GeoLite.dat',
}
file { "$geoip_destdir/GeoIPCity.dat":
ensure => link,
- target => "$geoip_destdir/GeoLiteCity.dat",
+ target => 'GeoLiteCity.dat',
}
} else {
# Fetch the proprietary paid-for MaxMind database
--
To view, visit https://gerrit.wikimedia.org/r/93712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b6938828a39d1b717db347c4ad72b79c81dbe74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
