From 14d0b375d4b09e175f1b9207463d07b4229cc14d Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 14 Nov 2014 10:59:23 +0200 Subject: [PATCH] wiki: Skip non-files when grepping for collab user Moin 1.9.8 creates cache in userdir and egrep on Ubuntu 14.04 returns error if grepping directories. --- wiki/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiki/manifests/init.pp b/wiki/manifests/init.pp index 1598209..eded04f 100644 --- a/wiki/manifests/init.pp +++ b/wiki/manifests/init.pp @@ -403,7 +403,7 @@ class wiki::collab { cwd => "/", user => "collab", group => "collab", - unless => "egrep '^name=collab$' /srv/wikis/collab/user/*", + unless => "egrep -D skip -d skip '^name=collab$' /srv/wikis/collab/user/*", require => Exec["collab-create collab collab"], before => Cron["collab-htaccess"], }