BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/144635

Change subject: Fix Exec['refresh_conf_symlinks']
......................................................................

Fix Exec['refresh_conf_symlinks']

Escape the wildcards passed to a2disconf and a2enconf so that the shell
doesn't expand them to the contents of the working directory and instead
passes a literal '*' to the commands.

Change-Id: I43412ef125ff0146ca860a1ffdc7854190d7a6d6
---
M puppet/modules/apache/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/35/144635/1

diff --git a/puppet/modules/apache/manifests/init.pp 
b/puppet/modules/apache/manifests/init.pp
index f1523f2..0de9440 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -54,7 +54,7 @@
     }
 
     exec { 'refresh_conf_symlinks':
-        command     => '/usr/sbin/a2disconf -q * ; /usr/sbin/a2enconf -q *',
+        command     => '/usr/sbin/a2disconf -q \* ; /usr/sbin/a2enconf -q \*',
         onlyif      => 'test -x /usr/sbin/a2disconf',
         refreshonly => true,
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/144635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43412ef125ff0146ca860a1ffdc7854190d7a6d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to