Commit d7bd5300 authored by Alex Tayts's avatar Alex Tayts
Browse files

improve some command parameters

parent a3e72161

metadata.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    },

    {

      "name": "puppetlabs/concat",

      "version_requirement": ">= 2.2.1

      "version_requirement": ">= 2.2.1"

    }

  ],

  "operatingsystem_support": [

templates/validate/mount.epp

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<%- $mounts.each |$mount| { %>

# mount: <%= $mount %>

echo -n "Mount <%= $mount %>..."

if df -hT | tr -s ' ' | cut -d ' ' -f 7 | egrep '^<%= $mount %>$' >/dev/null; then

if df --output=target | egrep '^<%= $mount %>$' >/dev/null; then

    echo " OK."

else

    echo " FAIL."

templates/validate/urls.epp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ if 'resolve_to' in $url { 
} else { $resolve = '' }

-%>

echo -n "Web URL <%= $url['url'] -%>..."

status=$(curl -I -XGET --insecure -m 3<%= $resolve %> <%= $url['url'] %> 2>/dev/null | head -n 1 | cut -d' ' -f2)

status=$(curl -s -o /dev/null -w "%{http_code}" -I -XGET --insecure -m 3<%= $resolve %> <%= $url['url'] %>)

if [ $status -eq <%= $url['status'] %> ]; then

    echo " OK."

else