diff --git a/slapos/recipe/check_page_content/__init__.py b/slapos/recipe/check_page_content/__init__.py index 2427815e3a1342a90a6588764abcc32c83dec47a..d6473eb40ee09f2d5aa4566139e023b349c4068b 100644 --- a/slapos/recipe/check_page_content/__init__.py +++ b/slapos/recipe/check_page_content/__init__.py @@ -38,6 +38,7 @@ class Recipe(GenericBaseRecipe): 'url': self.options['url'], 'shell_path': self.options['dash_path'], 'curl_path': self.options['curl_path'], + 'match': self.options.get('match', self.options['url']) } # XXX-Cedric in this script, curl won't check certificate diff --git a/slapos/recipe/check_page_content/template/check_page_content.in b/slapos/recipe/check_page_content/template/check_page_content.in index 49154a5acb06e09fd711f67bb976d36b96e39aa4..b0cc471d3e9cabb46cb26814f3ba314b9dee820a 100644 --- a/slapos/recipe/check_page_content/template/check_page_content.in +++ b/slapos/recipe/check_page_content/template/check_page_content.in @@ -3,13 +3,14 @@ # BEWARE: It will be overwritten automatically URL="%(url)s" +MATCH='%(match)s" if [ -z $URL ]; then echo "No URL specified." >&2 exit 3 fi -%(curl_path)s -k -sL $URL | grep "$URL" > /dev/null +%(curl_path)s -k -sL $URL | grep "$MATCH" > /dev/null if [ $? != 0 ]; then echo "Content at $URL seems to be corrupted" >&2