Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/322602
Change subject: Move production apache config files to templates ...................................................................... Move production apache config files to templates So we can add beta suffixes later Bug: T1256 Change-Id: I15ff34ce1c125949b78c1953de407a6fb97c766b --- M modules/mediawiki/manifests/web/prod_sites.pp R modules/mediawiki/templates/apache/sites/main.conf.erb R modules/mediawiki/templates/apache/sites/remnant.conf.erb R modules/mediawiki/templates/apache/sites/wikimania.conf.erb R modules/mediawiki/templates/apache/sites/wikimedia.conf.erb 5 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/02/322602/1 diff --git a/modules/mediawiki/manifests/web/prod_sites.pp b/modules/mediawiki/manifests/web/prod_sites.pp index d5119cf..db71450 100644 --- a/modules/mediawiki/manifests/web/prod_sites.pp +++ b/modules/mediawiki/manifests/web/prod_sites.pp @@ -2,42 +2,42 @@ tag 'mediawiki', 'mw-apache-config' apache::site { 'redirects': - source => 'puppet:///modules/mediawiki/apache/sites/redirects.conf', + source => 'puppet:///mediawiki/apache/sites/redirects.conf', priority => 2, } apache::site { 'main': - source => 'puppet:///modules/mediawiki/apache/sites/main.conf', + content => template('mediawiki/apache/sites/main.conf.erb'), priority => 3, } apache::site { 'remnant': - source => 'puppet:///modules/mediawiki/apache/sites/remnant.conf', + content => template('mediawiki/apache/sites/remnant.conf.erb'), priority => 4, } apache::site { 'search.wikimedia': - source => 'puppet:///modules/mediawiki/apache/sites/search.wikimedia.conf', + source => 'puppet:///mediawiki/apache/sites/search.wikimedia.conf', priority => 5, } apache::site { 'secure.wikimedia': - source => 'puppet:///modules/mediawiki/apache/sites/secure.wikimedia.conf', + source => 'puppet:///mediawiki/apache/sites/secure.wikimedia.conf', priority => 6, } apache::site { 'wikimania': - source => 'puppet:///modules/mediawiki/apache/sites/wikimania.conf', + content => template('mediawiki/apache/sites/wikimania.conf.erb'), priority => 7, } apache::site { 'wikimedia': - source => 'puppet:///modules/mediawiki/apache/sites/wikimedia.conf', + content => template('mediawiki/apache/sites/wikimedia.conf.erb'), priority => 8, } apache::site { 'foundation': - source => 'puppet:///modules/mediawiki/apache/sites/foundation.conf', + source => 'puppet:///mediawiki/apache/sites/foundation.conf', priority => 9, } } diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/templates/apache/sites/main.conf.erb similarity index 100% rename from modules/mediawiki/files/apache/sites/main.conf rename to modules/mediawiki/templates/apache/sites/main.conf.erb diff --git a/modules/mediawiki/files/apache/sites/remnant.conf b/modules/mediawiki/templates/apache/sites/remnant.conf.erb similarity index 100% rename from modules/mediawiki/files/apache/sites/remnant.conf rename to modules/mediawiki/templates/apache/sites/remnant.conf.erb diff --git a/modules/mediawiki/files/apache/sites/wikimania.conf b/modules/mediawiki/templates/apache/sites/wikimania.conf.erb similarity index 100% rename from modules/mediawiki/files/apache/sites/wikimania.conf rename to modules/mediawiki/templates/apache/sites/wikimania.conf.erb diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf b/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb similarity index 100% rename from modules/mediawiki/files/apache/sites/wikimedia.conf rename to modules/mediawiki/templates/apache/sites/wikimedia.conf.erb -- To view, visit https://gerrit.wikimedia.org/r/322602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15ff34ce1c125949b78c1953de407a6fb97c766b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits