Manybubbles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223953
Change subject: Fix errors in site_conf
......................................................................
Fix errors in site_conf
These errors were persistent so I broke out the big hammer.
Change-Id: I73cd50cc8f41cd4649002848c2c6eb604f075fae
---
M puppet/modules/apache/manifests/site_conf.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/53/223953/1
diff --git a/puppet/modules/apache/manifests/site_conf.pp
b/puppet/modules/apache/manifests/site_conf.pp
index 16a5971..09624e1 100644
--- a/puppet/modules/apache/manifests/site_conf.pp
+++ b/puppet/modules/apache/manifests/site_conf.pp
@@ -38,10 +38,21 @@
$title_safe = regsubst($title, '[\W_]', '-', 'G')
$conf_file = sprintf('%02d-%s.conf', $priority, $title_safe)
+ if ! defined(File["/etc/apache2/site-confs/${site_safe}"]) {
+ case $ensure {
+ absent: { $dirEnsure = 'absent' }
+ default: { $dirEnsure = 'directory' }
+ }
+ file { "/etc/apache2/site-confs/${site_safe}":
+ ensure => $dirEnsure
+ }
+ }
+
file { "/etc/apache2/site-confs/${site_safe}/${conf_file}":
ensure => $ensure,
content => $content,
source => $source,
notify => Service['apache2'],
+ require => File["/etc/apache2/site-confs/${site_safe}"],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/223953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I73cd50cc8f41cd4649002848c2c6eb604f075fae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <never...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
