From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 12 Sep 2015 02:11:15 +0000 (-0300)
Subject: Updates whereis to site_websites convention
X-Git-Tag: 0.2.4~306
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=73e0228dcfe77d4ec549bc3e29b85056939d7358;p=hydra.git

Updates whereis to site_websites convention
---

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