From 5a782f6c8f7923f9f415afd504ce6e71acbc7fef Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 14 Jan 2013 01:48:19 +0100 Subject: temper: remove --- temper/Makefile | 20 -------------------- temper/collectd-temper.sh | 9 --------- 2 files changed, 29 deletions(-) delete mode 100644 temper/Makefile delete mode 100755 temper/collectd-temper.sh diff --git a/temper/Makefile b/temper/Makefile deleted file mode 100644 index 80c0206f..00000000 --- a/temper/Makefile +++ /dev/null @@ -1,20 +0,0 @@ - -all: infest -infest: temper rules-install -CFLAGS = -O2 -Wall - -temper: temper.c - ${CC} -DUNIT_TEST -o $@ $^ -lusb - chmod +s temper - cp -a temper /usr/bin -clean: - rm -f temper *.o - -rules-install: /etc/udev/rules.d/99-tempsensor.rules -/etc/udev/rules.d/99-tempsensor.rules: - cp 99-tempsensor.rules /etc/udev/rules.d -debian-prereq: - apt-get install libusb-dev -uninstall: - rm -f /etc/udev/rules.d/99-tempsensor.rules /usr/bin/temper - diff --git a/temper/collectd-temper.sh b/temper/collectd-temper.sh deleted file mode 100755 index f66e9acc..00000000 --- a/temper/collectd-temper.sh +++ /dev/null @@ -1,9 +0,0 @@ -HOSTNAME="${COLLECTD_HOSTNAME:-localhost}" -INTERVAL="${COLLECTD_INTERVAL:-30}" -TEMPERNAME="${TEMPERNAME:-external}" -TEMPERBIN="${TEMPERBIN:-/krebs/temper/temper}" -#while sleep "$INTERVAL"; do - VALUE=`$TEMPERBIN` - echo "PUTVAL \"$HOSTNAME/sensors-temper/temperature-$TEMPERNAME\" N:$VALUE" #interval=$INTERVAL - logger "PUTVAL \"$HOSTNAME/sensors-temper/temperature-$TEMPERNAME\" N:$VALUE" #interval=$INTERVAL -#done -- cgit v1.2.3 From 3b520027006da7352801f1fb980b6a930b8d32f6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 12 Jun 2013 09:21:26 +0200 Subject: fix typo in tinc installer --- retiolum/scripts/tinc_setup/new_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 5999a5c8..76ed9e70 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -121,7 +121,7 @@ find_os() } find_telnet(){ - if exists elnet >/dev/null;then + if exists telnet >/dev/null;then TELNET="`command -v telnet`" elif exists busybox >/dev/null;then TELNET="`command -v busybox` telnet" -- cgit v1.2.3 From 6f38388c11f1e177dab8f40692902eb416818678 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Jun 2013 16:03:58 +0200 Subject: fix dart-serous hostname --- infest/profiles/makefu/vim/vimrc | 1 + retiolum/hosts/darth-serious | 12 ++++++++++++ retiolum/hosts/darth_serious | 12 ------------ 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 retiolum/hosts/darth-serious delete mode 100644 retiolum/hosts/darth_serious diff --git a/infest/profiles/makefu/vim/vimrc b/infest/profiles/makefu/vim/vimrc index 69ff3f58..123e15a5 100755 --- a/infest/profiles/makefu/vim/vimrc +++ b/infest/profiles/makefu/vim/vimrc @@ -11,6 +11,7 @@ Bundle 'gmarik/vundle' Bundle 'SudoEdit.vim' Bundle 'snipMate' Bundle 'tpope/vim-fugitive' +Bundle 'vim-scripts-iptables' Bundle 'pyflakes' filetype plugin indent on diff --git a/retiolum/hosts/darth-serious b/retiolum/hosts/darth-serious new file mode 100644 index 00000000..bcabc5f5 --- /dev/null +++ b/retiolum/hosts/darth-serious @@ -0,0 +1,12 @@ +Subnet = 10.243.0.84 +Subnet = 42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAyx5x0jzfhex8EBSFLlOIkP1yJ5cSPLQ3hpPMvN0J7QdVbypU6a9C +fzGpzBph1sRwXnaqCMe0og5VT3EdFtngbmm6t/CyMhBojkxMQI08m71JT5c07+1U +OSSLXBXYHcN6cAEYEsvTiSuvP9RoAbUeQQbZryI4wpzzQ7ET1l7k/3eeXAwqRKR6 +xiqn/4597U09QYmllqfplJUBv2pIAIcFlm/KHvNTZGEZS83udfnECwDwgU63PMns +38yiCpI79kagXyTOGCbkUatt0KNTzGNLAm0CyeFd1AdgUrj8fVg2jQLQlBrze+Gx +jkphgkVEgMtVMTz8WKfz+Dro3jBfQstIjQIDAQAB +-----END RSA PUBLIC KEY----- + diff --git a/retiolum/hosts/darth_serious b/retiolum/hosts/darth_serious deleted file mode 100644 index bcabc5f5..00000000 --- a/retiolum/hosts/darth_serious +++ /dev/null @@ -1,12 +0,0 @@ -Subnet = 10.243.0.84 -Subnet = 42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAyx5x0jzfhex8EBSFLlOIkP1yJ5cSPLQ3hpPMvN0J7QdVbypU6a9C -fzGpzBph1sRwXnaqCMe0og5VT3EdFtngbmm6t/CyMhBojkxMQI08m71JT5c07+1U -OSSLXBXYHcN6cAEYEsvTiSuvP9RoAbUeQQbZryI4wpzzQ7ET1l7k/3eeXAwqRKR6 -xiqn/4597U09QYmllqfplJUBv2pIAIcFlm/KHvNTZGEZS83udfnECwDwgU63PMns -38yiCpI79kagXyTOGCbkUatt0KNTzGNLAm0CyeFd1AdgUrj8fVg2jQLQlBrze+Gx -jkphgkVEgMtVMTz8WKfz+Dro3jBfQstIjQIDAQAB ------END RSA PUBLIC KEY----- - -- cgit v1.2.3 From 5a7d622655e554fd8ad7f2ff35ac84f094402341 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 17 Jun 2013 16:37:03 +0200 Subject: no-omo is now rfc hostname compliant --- retiolum/hosts/no-omo | 9 +++++++++ retiolum/hosts/no_omo | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 retiolum/hosts/no-omo delete mode 100644 retiolum/hosts/no_omo diff --git a/retiolum/hosts/no-omo b/retiolum/hosts/no-omo new file mode 100644 index 00000000..d2788d28 --- /dev/null +++ b/retiolum/hosts/no-omo @@ -0,0 +1,9 @@ +Subnet = 10.243.0.89/32 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM +ZdNMJB9CuOVVMHEaiY6Q5YchUmapGxwEObc0y+8zQxTPw3I4q0GkSJqKLPrsTpkn +sgEkHPfs2GVdtIBXDn9I8i5JsY2+U8QF8fbIQSOO08/Vpa3nknDAMege9yEa3NFm +s/+x+2pS+xV6uzf/H21XNv0oufInXwZH1NCNXAy5I2V6pz7BmAHilVOGCT7g2zn6 +GasmofiYEnro4V5s8gDlQkb7bCZEIA9EgX/HP6fZJQezSUHcDCQFI0vg26xywbr6 +5+9tTn8fN2mWS5+Pdmx3haX1qFcBP5HglwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/no_omo b/retiolum/hosts/no_omo deleted file mode 100644 index d2788d28..00000000 --- a/retiolum/hosts/no_omo +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.243.0.89/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM -ZdNMJB9CuOVVMHEaiY6Q5YchUmapGxwEObc0y+8zQxTPw3I4q0GkSJqKLPrsTpkn -sgEkHPfs2GVdtIBXDn9I8i5JsY2+U8QF8fbIQSOO08/Vpa3nknDAMege9yEa3NFm -s/+x+2pS+xV6uzf/H21XNv0oufInXwZH1NCNXAy5I2V6pz7BmAHilVOGCT7g2zn6 -GasmofiYEnro4V5s8gDlQkb7bCZEIA9EgX/HP6fZJQezSUHcDCQFI0vg26xywbr6 -5+9tTn8fN2mWS5+Pdmx3haX1qFcBP5HglwIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3