From 73e0228dcfe77d4ec549bc3e29b85056939d7358 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 11 Sep 2015 23:11:15 -0300 Subject: Updates whereis to site_websites convention --- share/hydra/whereis | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/share/hydra/whereis b/share/hydra/whereis index 6aff32d..687b280 100755 --- a/share/hydra/whereis +++ b/share/hydra/whereis @@ -50,11 +50,13 @@ if [ -e "$PUPPET/manifests/nodes/$LAYER.pp" ]; then fi # Is it a website? -if [ -e "$PUPPET/manifests/classes/websites.pp" ] && \ - grep -e "apache::site" "$PUPPET/manifests/classes/websites.pp" | grep -q "$LAYER" ; then - echo "Defined as a website on $PUPPET/manifests/classes/websites.pp:" +if [ -e "$PUPPET/modules/site_websites" ] && \ + grep -R -e "apache::site" "$PUPPET/modules/site_websites/manifests/" | grep -q "$LAYER" ; then + MANIFEST="$(cd $PUPPET && grep -R -e "apache::site" "modules/site_websites/manifests/" | grep "$LAYER" | cut -d : -f 1)" + + echo "Defined as a website on $MANIFEST:" echo "" - sed -n -e "/apache::site { \"$LAYER\":/,/ }/ p" $PUPPET/manifests/classes/websites.pp + sed -n -e "/apache::site { \"$LAYER\":/,/ }/ p" $PUPPET/$MANIFEST fi # DNS config -- cgit v1.2.3