nb-update

diff --git a/bin/nb-update b/bin/nb-update
index f8025df64a93b5b5ce8fdb9e179fe54d002130cf..94d609dcb77bb780359bd9c1d4ed4e972d574a09 100755 (executable)
--- a/bin/nb-update
+++ b/bin/nb-update
@@ -19,7 +19,6 @@ ex=0
 printf '#!%s\n%s\n' `which sh` 'ssh -o BatchMode=yes $@' > "$TMP" && chmod 755 "$TMP"
 export GIT_SSH="$TMP"
 
-errors=''
 for repo in $(nb-repo-dirs); do
 
 # NB 17.01.16   # Check dir
@@ -48,16 +47,15 @@ for repo in $(nb-repo-dirs); do
 
   if [ "$ret" != "0" ]; then
     ex=$ret && echo ">err $ret"
-    errors="$errors\n$cmd"
 
   else
     cmd_root="true"
     [ -x bin/$name-install ] && cmd_root="$cmd_root && echo '  >$name-install' && bin/$name-install|sed 's/^/    /'"
     #[ "$cmd_root" == "true" ] || eval "$cmd_root" || echo ">err"
-    if [ "$cmd_root" != "true" ] && ! eval "$cmd_root"; then
+    if [ "$cmd_root" != "true" ]; then
+      eval "$cmd_root"
       ex=$?
-      echo ">err"
-      errors="$errors\n$cmd_root"
+      [ "$ex" -gt "0" ] && echo ">err"
     fi
 
   fi
@@ -74,7 +72,6 @@ if [ "$ex" == "0" ]; then
   printf ">OK\n"
 else
   printf ">ERR\n"
-  [ -n "$errors" ] && printf "$errors" | mail -s "$NAME" -- nico@nbdom.net
 fi
 
 exit $ex

diff --git a/etc/cron/nb b/etc/cron/nb
index ce84d4fd1b31eb98a28fbfb77e7f502568b9068a..a7f55b503b67969eb869a793cb605226181006bd 100644 (file)
--- a/etc/cron/nb
+++ b/etc/cron/nb
@@ -8,5 +8,5 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/nb/bin
 #####################################################################
 # m h dom mon dow user command
 #
-*/15 09-23 * * * root nb-update >/var/log/nb.log 2>&1
-0    00-08 * * * root nb-update >/var/log/nb.log 2>&1
+*/15 09-23 * * * root nb-update >/var/log/nb.log 2>&1 || cat /var/log/nb.log
+0    00-08 * * * root nb-update >/var/log/nb.log 2>&1 || cat /var/log/nb.log

diff --git a/etc/dbs.php b/etc/dbs.php
index c82782a87a744c4cd6beac8ff39b2f773572d253..fc67de096350cc4ffd2232dbc5783efafaaa0361 100644 (file)
--- a/etc/dbs.php
+++ b/etc/dbs.php
@@ -111,8 +111,18 @@ $CONF = array (
     'password' => 'mpc60ax73',
     'type' => 'mysql',
     'name' => 'nb',
+    'default_table' => 'rent',
     'tables' => array(
-      
+      'rent' => array(
+        'order_by' => 'start desc',
+        'replace' => array (
+          'idtenant' => 'tenant.name',
+          'idplace' => 'addr.addr',
+        ),
+        'columns' => array (
+          'total' => function(&$r) {$r['rent'] + $r['charge'];}
+        ),
+      ),
     ),
   ),
   'puppetdb' => array (