Dzahn has submitted this change and it was merged. Change subject: mw-rc-irc - use apache::site ......................................................................
mw-rc-irc - use apache::site use the newer apache::site method to setup the Apache site move config from files to templates (it should still make use of it later) Change-Id: Id6dc414a9d08d0c77bfa55aae1d517b2b5d8b0e1 --- M modules/mw-rc-irc/manifests/apache.pp R modules/mw-rc-irc/templates/apache/irc.wikimedia.org.erb 2 files changed, 2 insertions(+), 13 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/mw-rc-irc/manifests/apache.pp b/modules/mw-rc-irc/manifests/apache.pp index 9f85896..8c101b8 100644 --- a/modules/mw-rc-irc/manifests/apache.pp +++ b/modules/mw-rc-irc/manifests/apache.pp @@ -1,18 +1,7 @@ # redirect http://irc.wikimedia.org to http://meta.wikimedia.org/wiki/IRC class mw-rc-irc::apache { - - file { - '/etc/apache2/sites-enabled/irc.wikimedia.org': - mode => '0444', - owner => 'root', - group => 'root', - source => 'puppet:///modules/mw-rc-irc/apache/irc.wikimedia.org'; + apache::site { 'irc.wikimedia.org': + content => template('mw-rc-irc/apache/irc.wikimedia.org.erb'), } - - class { 'apache': - serveradmin => '[email protected]', - before => File['/etc/apache2/sites-enabled/irc.wikimedia.org'], - } - } diff --git a/modules/mw-rc-irc/files/apache/irc.wikimedia.org b/modules/mw-rc-irc/templates/apache/irc.wikimedia.org.erb similarity index 100% rename from modules/mw-rc-irc/files/apache/irc.wikimedia.org rename to modules/mw-rc-irc/templates/apache/irc.wikimedia.org.erb -- To view, visit https://gerrit.wikimedia.org/r/153843 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6dc414a9d08d0c77bfa55aae1d517b2b5d8b0e1 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: JanZerebecki <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Tim Landscheidt <[email protected]> Gerrit-Reviewer: coren <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
