Dzahn has submitted this change and it was merged.
Change subject: replace deprecated erb template variable syntax
......................................................................
replace deprecated erb template variable syntax
use scope.lookupvar for puppet3
Change-Id: Id47c00c81fd5e84cc404f7a79ff887b8b3694d4d
---
M modules/wikistats/templates/apache/wikistats.erb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Matanya: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/wikistats/templates/apache/wikistats.erb
b/modules/wikistats/templates/apache/wikistats.erb
index 3af7715..ea3b4d1 100644
--- a/modules/wikistats/templates/apache/wikistats.erb
+++ b/modules/wikistats/templates/apache/wikistats.erb
@@ -6,10 +6,10 @@
<VirtualHost *:80>
- ServerName <%= wikistats_host %>
+ ServerName <%= scope.lookupvar('wikistats::wikistats_host') %>
# RewriteEngine on
- # RewriteRule ^/(.*)$ https://<%= wikistats_host %>/$1 [R=301]
+ # RewriteRule ^/(.*)$ https://<%=
scope.lookupvar('wikistats::wikistats_host') %>/$1 [R=301]
DocumentRoot /var/www/wikistats
--
To view, visit https://gerrit.wikimedia.org/r/143526
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id47c00c81fd5e84cc404f7a79ff887b8b3694d4d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
