From 2183f5ccf93dae070e01bf68481665b4af82090e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Aug 2011 10:29:19 +0200 Subject: cleanup: update lcd4linux file --- kachelmann/changes | 24 ------------------------ kachelmann/conditions | 6 ------ licht/licht.sh | 13 ------------- oncology/Makefile | 1 + oncology/lcd4linux.conf | 18 +++++++++--------- 5 files changed, 10 insertions(+), 52 deletions(-) delete mode 100755 kachelmann/changes delete mode 100755 kachelmann/conditions delete mode 100644 licht/licht.sh diff --git a/kachelmann/changes b/kachelmann/changes deleted file mode 100755 index 22116967..00000000 --- a/kachelmann/changes +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/perl -use XML::Simple; -my $xml = new XML::Simple; -my $xml_store = undef; -my $data_new = undef; -my $data_old = undef; -my $condition_store = undef; - - -my $data_old = $condition_store; -while (1) { - &xml_update(); - $data_old = $data_new; - $data_new = $condition_store; - if($data_new ne $data_old){ - system("espeak \"Das Wetter hat sich von $data_old in $data_new verändert\n\""); - } - sleep 300; -} -sub xml_update(){ - $xml_store = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`; - $xml_store = $xml->XMLin($xml_store); - $condition_store = $xml_store->{weather}->{current_conditions}->{condition}->{data}; -} diff --git a/kachelmann/conditions b/kachelmann/conditions deleted file mode 100755 index ea4ba5ca..00000000 --- a/kachelmann/conditions +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/perl -use XML::Simple; -my $result = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`; -my $xml = new XML::Simple; -my $data = $xml->XMLin($result); -print ("Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n"); diff --git a/licht/licht.sh b/licht/licht.sh deleted file mode 100644 index d73a73c8..00000000 --- a/licht/licht.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -LAMPE="$1" -TOGGLE="$2" -LAMP=~s/[a-zA-Z]//g -TOGGLE=~s/[a-zA-Z]//g -STRING="\xA5\x5A\d$LAMPE\d$TOGGLE" -if [ $# != 2 ] -then - echo -ne "Usage: licht <0/1>" -else - echo "$LAMPE$TOGGLE" - echo -ne "$STRING" | nc -u -w1 10.42.3.100 1337 -fi diff --git a/oncology/Makefile b/oncology/Makefile index 258ee130..05d5c422 100644 --- a/oncology/Makefile +++ b/oncology/Makefile @@ -15,6 +15,7 @@ install: /usr/bin/lcd4linux /etc/lcd4linux.conf lcd4linux_autostart # TODO this is debian only update: /etc/lcd4linux.conf + service lcd4linux force-reload /etc/lcd4linux.conf: lcd4linux.conf chown krebs:krebs lcd4linux.conf diff --git a/oncology/lcd4linux.conf b/oncology/lcd4linux.conf index 34df9f65..be16629d 100644 --- a/oncology/lcd4linux.conf +++ b/oncology/lcd4linux.conf @@ -235,7 +235,7 @@ Widget MemorySwappedUsed { Widget LoggedInTitle { class 'Text' - expression 'Logged in users' + expression 'Hosts in Krebs Darknet' width width050 align 'L' update 0 @@ -243,10 +243,10 @@ Widget LoggedInTitle { Widget LoggedIn { class 'Text' - expression exec('who | awk \' { print $1 }\' | sort -ud | tr "\n" " "') + expression exec('/krebs/oncology/bin/krebshostup') width width050 align 'L' - update 2 * second + update 300 * second } Widget FSSpaceTitle { @@ -426,7 +426,7 @@ Widget TwonkyStatus { Widget FileTitle { class 'Text' - expression 'NumPad Logging' + expression 'Syslog' width width100 align 'C' Background lightgray @@ -539,22 +539,22 @@ Layout Krebs { Row07.Col29 'MemorySwappedTotal' Row08.Col29 'MemorySwappedUsed' Row10.Col28 'LoggedInTitle' - #Row11.Col29 'LoggedIn' + Row11.Col29 'LoggedIn' Row13.Col28 'FSSpaceTitle' Row14.Col29 'FSSpace1' Row17.Col02 'ServicesTitle' #Row18.Col02 'BindDNSStatus' #Row19.Col02 'MuninStatus' - Row20.Col02 'ApacheStatus' + Row18.Col02 'ApacheStatus' #Row21.Col02 'MiniDLNAStatus' #Row18.Col29 'PostfixStatus' #Row19.Col29 'ProFTPStatus' #Row20.Col29 'SambaStatusDS' - Row20.Col29 'SSHStatusDS' + Row18.Col29 'SSHStatusDS' - Row21.Col02 'Weather1' - Row22.Col02 'Bitcoin' + Row19.Col02 'Weather1' + Row21.Col02 'Bitcoin' Row23.Col02 'Stream' Row25.Col02 'FileTitle' -- cgit v1.2.3