Dzahn has submitted this change and it was merged.
Change subject: gerrit - use apache::site
......................................................................
gerrit - use apache::site
use the newer apache::site method rather
than a file{} resource and have proper
symlinks again
currently, due to refactoring, it looks like this:
ytterbium:/etc/apache2/sites-enabled# file gerrit.wikimedia.org
gerrit.wikimedia.org: ASCII English text, with very long lines
ytterbium:/etc/apache2/sites-available# file gerrit.wikimedia.org
gerrit.wikimedia.org: ASCII English text
ytterbium:/etc/apache2/sites-available#
if diff -q gerrit.wikimedia.org ../sites-enabled/gerrit.wikimedia.org;
then echo "2 files with different content, confusing"; fi
Files gerrit.wikimedia.org and ../sites-enabled/gerrit.wikimedia.org differ
Change-Id: Iaacd0dcd9bed12afcfe84c02e59cfd7ec88f9eaa
---
M manifests/gerrit.pp
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index ccab5dc..079bec2 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -288,15 +288,10 @@
$ssl_cert = '',
$ssl_cert_key= '') {
- require webserver::apache
-
- file { '/etc/apache2/sites-enabled/gerrit.wikimedia.org':
- ensure => present,
- mode => '0644',
- owner => 'root',
- group => 'root',
+ apache::site { 'gerrit.wikimedia.org':
content => template('apache/sites/gerrit.wikimedia.org.erb'),
}
+
# We don't use gitweb anymore, so we're going to allow spiders again
# If it becomes a problem, just set ensure => present again
file { '/var/www/robots.txt':
--
To view, visit https://gerrit.wikimedia.org/r/153849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaacd0dcd9bed12afcfe84c02e59cfd7ec88f9eaa
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: QChris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
