Merge branch 'master' into dev-fred

.install/templates/4a/daemon.php

@@ -3,7 +3,7 @@
 if(php_sapi_name() != 'cli' && !empty($_SERVER['REMOTE_ADDR'])) exit("Access Denied.");
 
 // Please configure this
-$url = "https://g1sms-blois-2.p2p.legal";
+$url = "http://_DOMAIN";
 
 fclose(fopen($url."/index.php/daemon/message_routine/", "r"));
 

_chain

@@ -1 +1,5 @@
+<<<<<<< HEAD
 QmeNcQbpgX1e3SYZq2PweqYVKeYM923gGCkmLrLpZuKUbQ
+=======
+QmdKvkQL65ibGXEBXGxZZu9a58udDCZPutC1NZQfFm9sDT
+>>>>>>> master

_nanodate

@@ -1 +1 @@
-1578331888355885994
+1576935242369880952

shell/cron_MINUTE.sh

@@ -31,13 +31,6 @@ if [[ "$1" == "" ]]; then
 fi
 ##################################################################
 
-################################################################################
-# PRINT G1Tag PRINTED FROM ANOTHER NODE
-# CREATE and REMOVE rr.bin -> done.rr
-## if [[ -d "./wallets_swarm/.$IPFSNODEID/PRINT/" ]]; then
-##     log "__SUB:cron_MINUTE.sh: SEARCH NEW PRINT FOR ME .$IPFSNODEID"
-##     mkdir -p ./wallets/.$IPFSNODEID/PRINT/
-
 ##################################################################
 if [[ "$1" == "PRINT" ]]; then
 ##################################################################

shell/manual_BILLETS_PERIMES.sh

@@ -42,7 +42,7 @@ for result in $(find billets/ -daystart -mtime +$vieux -type d -name "*"); do
         echo $secret $salt
         echo "/usr/local/bin/silkaj tx --amount=\"$virement\" --output=\"$dest\""
 
-        if [[ "$solde" == "0.0" ]]; then
+        if [[ "$virement" == "0.0" ]]; then
             echo "G1Billet déjà vide, suppression de $result"; rm -Rf $result;
         else
             PAY=$(/usr/local/bin/silkaj -p duniter-g1.p2p.legal:443 tx --amount="$virement" --output="$dest" --comment="[G1Billet] $numero" -y)