etc/profile.d/nb.sh

diff --git a/bin/nb-update b/bin/nb-update
index 1d934bf7f2dcf98f492f302d5b0aa91defd8983c..109b0a2e32c5535982acce84e89cc29187fdd3db 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -87,7 +87,7 @@ for repo in $(nb_repos); do
   fi
 
   echo
-  nb_host_info $NAME.$name $([ "$ex" = "0" ] && echo ok || echo "err=$ex" ) 1>/dev/null 2>&1
+  nb_api_insert host_info $NAME.$name $([ "$ex" = "0" ] && echo ok || echo "err=$ex" ) 1>/dev/null 2>&1
 
 done
 
@@ -104,7 +104,7 @@ fi
 find /tmp/$NAME.infos -mmin +60 > /dev/null 2>&1
 if [ ! -e /tmp/$NAME.infos ]; then
   touch /tmp/$NAME.infos
-  nb_host_info >/dev/null 2>&1 arch $(sysctl -n hw.machine || arch)
-  nb_host_info >/dev/null 2>&1 nproc $(sysctl -n hw.ncpu || nproc || grep ^proc /proc/cpuinfo |wc -)
+  nb_api_insert host_info >/dev/null 2>&1 arch $(sysctl -n hw.machine || arch)
+  nb_api_insert host_info >/dev/null 2>&1 nproc $(sysctl -n hw.ncpu || nproc || grep ^proc /proc/cpuinfo |wc -)
 fi
 exit $ex

diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index ab8c46e6fd96d923da0b896e47b23a30373fc9d4..0cefa9024c29328b78f67a9b43035f43673ada89 100644 (file)
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -72,10 +72,18 @@ nb_perl() {
   ruby -r$NB_ROOT/lib/perl/NB -e "$@"
 }
 
-nb_host_info() {
+nb_api_insert() {
+  local usage="Usage: nb_api_insert TABLE field1=val1 field2=val2 ..."
+  local table="${1:?$usage}"; shift
+
   local host=$(hostname)
   [ -z "$host" ] && host=$(hostname -f)
-  local key="$1"
-  local val="$2"
-  curl -u nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT https://nbdom.net/host_info -H 'Accept: text/json' -d "host=$host" -d "key=$key" -d "val=$val"
+
+  local curl="curl -u nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT -H 'Accept: text/json' https://api.nbdom.net/data/$table/insert"
+
+  while [ "$#" -gt "0" ]; do
+    curl+=" -d $1"
+    shift
+  done
+  eval "$curl"
 }