Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393358 )
Change subject: puppetmaster.erb: allow switching of puppetmaster_rack_path
......................................................................
puppetmaster.erb: allow switching of puppetmaster_rack_path
Followup for e29625a220be120b4ba4a23d19fac4fc3f6a75b2
Change-Id: I2a99e33869661f2b65f224b53a4f38fff305bc2b
---
M modules/puppetmaster/templates/puppetmaster.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Herron: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/puppetmaster/templates/puppetmaster.erb
b/modules/puppetmaster/templates/puppetmaster.erb
index 9c3e3b5..4238348 100644
--- a/modules/puppetmaster/templates/puppetmaster.erb
+++ b/modules/puppetmaster/templates/puppetmaster.erb
@@ -25,8 +25,8 @@
<%- end -%>
</Location>
- DocumentRoot /usr/share/puppet/rack/puppetmasterd/public
- <Directory /usr/share/puppet/rack/puppetmasterd/>
+ DocumentRoot <%= @puppetmaster_rack_path %>/public
+ <Directory <%= @puppetmaster_rack_path %>/>
Options None
AllowOverride None
Require all granted
--
To view, visit https://gerrit.wikimedia.org/r/393358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a99e33869661f2b65f224b53a4f38fff305bc2b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Herron <kher...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
