Dzahn has submitted this change and it was merged.

Change subject: svn - move Apache config from file to template
......................................................................


svn - move Apache config from file to template

Change-Id: Ia4b43d88578c6356393f60bd15c01d164fa98ac3
---
M modules/subversion/manifests/init.pp
R modules/subversion/templates/apache/svn.wikimedia.org.erb
2 files changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/subversion/manifests/init.pp 
b/modules/subversion/manifests/init.pp
index f2737c3..938506e 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -56,6 +56,6 @@
     }
 
     ::apache::site { $host:
-        source => "puppet:///modules/subversion/apache/${host}",
+        content => template("subversion/apache/${host}.erb"),
     }
 }
diff --git a/modules/subversion/files/apache/svn.wikimedia.org 
b/modules/subversion/templates/apache/svn.wikimedia.org.erb
similarity index 100%
rename from modules/subversion/files/apache/svn.wikimedia.org
rename to modules/subversion/templates/apache/svn.wikimedia.org.erb

-- 
To view, visit https://gerrit.wikimedia.org/r/153989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia4b43d88578c6356393f60bd15c01d164fa98ac3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to