From 2c5ba99a88417e1f7482b03fd5f8deb890168873 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 4 Sep 2013 18:47:09 +0200 Subject: make curl silent --- manifests/add_user.pp | 2 +- manifests/document.pp | 4 ++-- manifests/query.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/add_user.pp b/manifests/add_user.pp index 28826f3..659aea8 100644 --- a/manifests/add_user.pp +++ b/manifests/add_user.pp @@ -29,6 +29,6 @@ define couchdb::add_user ( $roles, $pw, $salt = '' ) { db => '_users', id => "org.couchdb.user:${name}", data => $data, - unless => "/usr/bin/curl -f ${name}:${pw}@127.0.0.1:${port}/" + unless => "/usr/bin/curl -s -f ${name}:${pw}@127.0.0.1:${port}/" } } diff --git a/manifests/document.pp b/manifests/document.pp index 77296dc..be68983 100644 --- a/manifests/document.pp +++ b/manifests/document.pp @@ -28,7 +28,7 @@ define couchdb::document( cmd => 'PUT', host => $host, path => "${db}/${id}", - unless => "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc ${url}" + unless => "/usr/bin/curl -s --netrc-file /etc/couchdb/couchdb.netrc ${url}" } } @@ -37,7 +37,7 @@ define couchdb::document( cmd => 'DELETE', host => $host, path => "${db}/${id}", - onlyif => "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc ${url}" + onlyif => "/usr/bin/curl -s --netrc-file /etc/couchdb/couchdb.netrc ${url}" } } } diff --git a/manifests/query.pp b/manifests/query.pp index 0549ded..72ae4d2 100644 --- a/manifests/query.pp +++ b/manifests/query.pp @@ -1,7 +1,7 @@ define couchdb::query ( $cmd, $path, $host='127.0.0.1:5984', $data = '{}', $unless = undef) { - exec { "/usr/bin/curl --netrc-file /etc/couchdb/couchdb.netrc -X ${cmd} ${host}/${path} --data \'${data}\'": + exec { "/usr/bin/curl -s --netrc-file /etc/couchdb/couchdb.netrc -X ${cmd} ${host}/${path} --data \'${data}\'": require => [ Package['curl'], Exec['wait_for_couchdb'] ], unless => $unless } -- cgit v1.2.3