Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153959
Change subject: contint-use apache::site,move config to templates
......................................................................
contint-use apache::site,move config to templates
for doc, integration etc.
use the newer apache::site method to setup
the Apache sites
move the files to templates (like one of them already is)
for consistency
Change-Id: I2b7b51ac1d8096d868c63d84c577df8afecc4840
---
M modules/contint/manifests/localvhost.pp
M modules/contint/manifests/website.pp
R modules/contint/templates/apache/doc.wikimedia.org
R modules/contint/templates/apache/integration.mediawiki.org
4 files changed, 8 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/153959/1
diff --git a/modules/contint/manifests/localvhost.pp
b/modules/contint/manifests/localvhost.pp
index 2acafcc..977f3ab 100644
--- a/modules/contint/manifests/localvhost.pp
+++ b/modules/contint/manifests/localvhost.pp
@@ -20,10 +20,7 @@
$log_prefix = $name,
){
- file { "/etc/apache2/sites-enabled/${name}.localhost":
- mode => '0444',
- owner => 'root',
- group => 'root',
+ apache::site { "${name}.localhost":
content => template('contint/apache/localvhost.erb'),
}
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index aa2e090..68911b0 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -49,19 +49,13 @@
}
# Apache configuration for integration.wikimedia.org
- file { '/etc/apache2/sites-enabled/integration.wikimedia.org':
- mode => '0444',
- owner => 'root',
- group => 'root',
+ apache::site { 'integration.wikimedia.org':
content => template('contint/apache/integration.wikimedia.org.erb'),
}
# Apache configuration for integration.mediawiki.org
- file { '/etc/apache2/sites-enabled/integration.mediawiki.org':
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/contint/apache/integration.mediawiki.org',
+ apache::site { 'integration.mediawiki.org':
+ content => template('contint/apache/integration.mediawiki.org.erb',
}
# Written to by jenkins for automatically generated
@@ -72,11 +66,10 @@
owner => 'jenkins-slave',
group => 'jenkins-slave',
}
- file { '/etc/apache2/sites-enabled/doc.wikimedia.org':
- mode => '0444',
- owner => 'root',
- group => 'root',
- source => 'puppet:///modules/contint/apache/doc.wikimedia.org',
+
+ # Apache configuration for doc.wikimedia.org
+ apache::site { 'doc.wikimedia.org':
+ content => template('contint/apache/doc.wikimedia.org.erb',
}
}
diff --git a/modules/contint/files/apache/doc.wikimedia.org
b/modules/contint/templates/apache/doc.wikimedia.org
similarity index 100%
rename from modules/contint/files/apache/doc.wikimedia.org
rename to modules/contint/templates/apache/doc.wikimedia.org
diff --git a/modules/contint/files/apache/integration.mediawiki.org
b/modules/contint/templates/apache/integration.mediawiki.org
similarity index 100%
rename from modules/contint/files/apache/integration.mediawiki.org
rename to modules/contint/templates/apache/integration.mediawiki.org
--
To view, visit https://gerrit.wikimedia.org/r/153959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b7b51ac1d8096d868c63d84c577df8afecc4840
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
