From 257841947a43b619fbd527d70a1975af998f1d4d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 Apr 2020 09:22:14 +0200 Subject: [PATCH] add crypto-LTC update lxc (moved to run.sh) --- htdocs/crypto.html | 34 ++++++++++++-------- run.sh | 4 ++- scripts/getCryptocurrencies.sh | 3 +- scripts/lxc_rrd-tmpl.sh | 3 +- tmpl/crypto-BTC.tmpl | 1 - tmpl/crypto-EOS.tmpl | 1 - tmpl/crypto-ETH.tmpl | 1 - tmpl/crypto-LTC.tmpl | 14 ++++++++ tmpl/crypto-XLM.tmpl | 1 - tmpl/crypto-XRP.tmpl | 1 - tmpl/crypto-XTZ.tmpl | 1 - tmpl/lxc-cloud.net.tmpl | 1 - tmpl/lxc-db.net.tmpl | 1 - tmpl/lxc-gitea.net.tmpl | 1 - tmpl/lxc-home-assistant.net.tmpl | 1 - tmpl/lxc-jitsi.net.tmpl | 1 - tmpl/lxc-mail.net.tmpl | 1 - tmpl/lxc-matrix.net.tmpl | 1 - tmpl/lxc-motion.net.tmpl | 1 - tmpl/lxc-mqtt.net.tmpl | 1 - tmpl/lxc-mrtg.net.tmpl | 1 - tmpl/lxc-node-red.net.tmpl | 1 - tmpl/lxc-pihole.net.tmpl | 1 - tmpl/lxc-redis.net.tmpl | 1 - tmpl/lxc-traccar.net.tmpl | 1 - tmpl/lxc-webmail.net.tmpl | 1 - tmpl/lxc-wireguard.net.tmpl | 1 - tmpl/lxc-www-familienhilfe-baeumler.net.tmpl | 1 - tmpl/lxc-www.net.tmpl | 1 - 29 files changed, 39 insertions(+), 43 deletions(-) create mode 100644 tmpl/crypto-LTC.tmpl diff --git a/htdocs/crypto.html b/htdocs/crypto.html index 7438e60..f5413f6 100644 --- a/htdocs/crypto.html +++ b/htdocs/crypto.html @@ -19,32 +19,38 @@ BTC-EUR -
- [Etherium (ETH)]
- ETH-EUR +
+ [Litecoin (LTC)]
+ ETH-EUR
-
- [Ripple (XRP)]
- XRP-EUR -
- -
[EOS (EOS)]
EOS-EUR
+ [Stellar Lumens (XLM)]
+ XLM-EUR +
+ +
+ +
+ [Etherium (ETH)]
+ ETH-EUR +
+ +
+ [Ripple (XRP)]
+ XRP-EUR +
+ +
[Tezos (XTZ)]
XTZ-EUR
-
- [Stellar Lumens (XLM)]
- XLM-EUR -
-
diff --git a/run.sh b/run.sh index f6f80d5..348e71a 100755 --- a/run.sh +++ b/run.sh @@ -1,5 +1,8 @@ #!/bin/sh +/var/www/mrtg/scripts/getCryptocurrencies.sh +/var/www/mrtg/scripts/lxc_update.sh + MRTG="/usr/bin/mrtg" CFGDIR="/var/www/mrtg/config" @@ -9,4 +12,3 @@ do LANG=C $MRTG "$cfg" & done -/var/www/mrtg/scripts/getCryptocurrencies.sh diff --git a/scripts/getCryptocurrencies.sh b/scripts/getCryptocurrencies.sh index cc532f4..972fc81 100755 --- a/scripts/getCryptocurrencies.sh +++ b/scripts/getCryptocurrencies.sh @@ -4,7 +4,7 @@ RRDDIR="/var/www/localhost/rrd" RRDPREFIX="crypto-" TMPLDIR="/var/www/localhost/tmpl" -for c in BTC ETH XRP EOS XTZ XLM; +for c in BTC ETH XRP EOS XTZ XLM LTC; do if [[ ! -f "${RRDDIR}/${RRDPREFIX}${c}.rrd" ]]; then @@ -37,7 +37,6 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 EOF fi done diff --git a/scripts/lxc_rrd-tmpl.sh b/scripts/lxc_rrd-tmpl.sh index 3ff8fa6..ffa5991 100755 --- a/scripts/lxc_rrd-tmpl.sh +++ b/scripts/lxc_rrd-tmpl.sh @@ -40,7 +40,6 @@ LINE1:TX#2EA349:Tx GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps -GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000" > "$DIR/lxc-$c.net.tmpl" +GPRINT:TX:LAST:%6.2lf %sbps\n" > "$DIR/lxc-$c.net.tmpl" done diff --git a/tmpl/crypto-BTC.tmpl b/tmpl/crypto-BTC.tmpl index 16aeff5..d33fe09 100644 --- a/tmpl/crypto-BTC.tmpl +++ b/tmpl/crypto-BTC.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/crypto-EOS.tmpl b/tmpl/crypto-EOS.tmpl index 7c91542..ae8b80f 100644 --- a/tmpl/crypto-EOS.tmpl +++ b/tmpl/crypto-EOS.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/crypto-ETH.tmpl b/tmpl/crypto-ETH.tmpl index 625b6af..ec43655 100644 --- a/tmpl/crypto-ETH.tmpl +++ b/tmpl/crypto-ETH.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/crypto-LTC.tmpl b/tmpl/crypto-LTC.tmpl new file mode 100644 index 0000000..fb196b9 --- /dev/null +++ b/tmpl/crypto-LTC.tmpl @@ -0,0 +1,14 @@ +-v LTC in EUR +-t LTC sell +--full-size-mode +--color=BACK#343637 +--color=CANVAS#F0F0F0 +--color=FONT#F0F0F0 +--font=TITLE:12:DejaVu Bold +DEF:sell=/var/www/localhost/rrd/crypto-LTC.rrd:sell:AVERAGE +COMMENT: max. avg. min. cur.\n +AREA:sell#CC9A5760:sell +GPRINT:sell:MAX:%6.4lf %sEUR +GPRINT:sell:AVERAGE:%6.4lf %sEUR +GPRINT:sell:MIN:%6.4lf %sEUR +GPRINT:sell:LAST:%6.4lf %sEUR\n diff --git a/tmpl/crypto-XLM.tmpl b/tmpl/crypto-XLM.tmpl index ce142db..17ecfc3 100644 --- a/tmpl/crypto-XLM.tmpl +++ b/tmpl/crypto-XLM.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/crypto-XRP.tmpl b/tmpl/crypto-XRP.tmpl index 3abcf4e..42af36d 100644 --- a/tmpl/crypto-XRP.tmpl +++ b/tmpl/crypto-XRP.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/crypto-XTZ.tmpl b/tmpl/crypto-XTZ.tmpl index 66ace06..18ebf6f 100644 --- a/tmpl/crypto-XTZ.tmpl +++ b/tmpl/crypto-XTZ.tmpl @@ -12,4 +12,3 @@ GPRINT:sell:MAX:%6.4lf %sEUR GPRINT:sell:AVERAGE:%6.4lf %sEUR GPRINT:sell:MIN:%6.4lf %sEUR GPRINT:sell:LAST:%6.4lf %sEUR\n -LINE1:0#000000 diff --git a/tmpl/lxc-cloud.net.tmpl b/tmpl/lxc-cloud.net.tmpl index 035280e..716271b 100644 --- a/tmpl/lxc-cloud.net.tmpl +++ b/tmpl/lxc-cloud.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-db.net.tmpl b/tmpl/lxc-db.net.tmpl index 4d130e8..4ec4a51 100644 --- a/tmpl/lxc-db.net.tmpl +++ b/tmpl/lxc-db.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-gitea.net.tmpl b/tmpl/lxc-gitea.net.tmpl index 50080de..9797fc4 100644 --- a/tmpl/lxc-gitea.net.tmpl +++ b/tmpl/lxc-gitea.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-home-assistant.net.tmpl b/tmpl/lxc-home-assistant.net.tmpl index 186d8c9..7499edc 100644 --- a/tmpl/lxc-home-assistant.net.tmpl +++ b/tmpl/lxc-home-assistant.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-jitsi.net.tmpl b/tmpl/lxc-jitsi.net.tmpl index 5bf58ca..86b8f81 100644 --- a/tmpl/lxc-jitsi.net.tmpl +++ b/tmpl/lxc-jitsi.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-mail.net.tmpl b/tmpl/lxc-mail.net.tmpl index 77dd3a0..e86526c 100644 --- a/tmpl/lxc-mail.net.tmpl +++ b/tmpl/lxc-mail.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-matrix.net.tmpl b/tmpl/lxc-matrix.net.tmpl index 1127110..2c57a35 100644 --- a/tmpl/lxc-matrix.net.tmpl +++ b/tmpl/lxc-matrix.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-motion.net.tmpl b/tmpl/lxc-motion.net.tmpl index 920b1e7..1fe837b 100644 --- a/tmpl/lxc-motion.net.tmpl +++ b/tmpl/lxc-motion.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-mqtt.net.tmpl b/tmpl/lxc-mqtt.net.tmpl index 45dc858..79e1f46 100644 --- a/tmpl/lxc-mqtt.net.tmpl +++ b/tmpl/lxc-mqtt.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-mrtg.net.tmpl b/tmpl/lxc-mrtg.net.tmpl index 5be352b..dc82a48 100644 --- a/tmpl/lxc-mrtg.net.tmpl +++ b/tmpl/lxc-mrtg.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-node-red.net.tmpl b/tmpl/lxc-node-red.net.tmpl index e05a6d7..c588b77 100644 --- a/tmpl/lxc-node-red.net.tmpl +++ b/tmpl/lxc-node-red.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-pihole.net.tmpl b/tmpl/lxc-pihole.net.tmpl index 49da56c..979e706 100644 --- a/tmpl/lxc-pihole.net.tmpl +++ b/tmpl/lxc-pihole.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-redis.net.tmpl b/tmpl/lxc-redis.net.tmpl index 3058338..b3efd11 100644 --- a/tmpl/lxc-redis.net.tmpl +++ b/tmpl/lxc-redis.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-traccar.net.tmpl b/tmpl/lxc-traccar.net.tmpl index 41c6ec3..f0e28be 100644 --- a/tmpl/lxc-traccar.net.tmpl +++ b/tmpl/lxc-traccar.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-webmail.net.tmpl b/tmpl/lxc-webmail.net.tmpl index d5e58b5..f56c6b7 100644 --- a/tmpl/lxc-webmail.net.tmpl +++ b/tmpl/lxc-webmail.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-wireguard.net.tmpl b/tmpl/lxc-wireguard.net.tmpl index b3e8f27..3e75550 100644 --- a/tmpl/lxc-wireguard.net.tmpl +++ b/tmpl/lxc-wireguard.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-www-familienhilfe-baeumler.net.tmpl b/tmpl/lxc-www-familienhilfe-baeumler.net.tmpl index 6699d50..41ed7f2 100644 --- a/tmpl/lxc-www-familienhilfe-baeumler.net.tmpl +++ b/tmpl/lxc-www-familienhilfe-baeumler.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000 diff --git a/tmpl/lxc-www.net.tmpl b/tmpl/lxc-www.net.tmpl index 68fa032..0baf8c1 100644 --- a/tmpl/lxc-www.net.tmpl +++ b/tmpl/lxc-www.net.tmpl @@ -20,4 +20,3 @@ GPRINT:TX:MAX:%6.2lf %sbps GPRINT:TX:AVERAGE:%6.2lf %sbps GPRINT:TX:MIN:%6.2lf %sbps GPRINT:TX:LAST:%6.2lf %sbps\n -LINE1:0#000000