diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-29 15:48:47 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-29 15:48:47 +0200 |
| commit | 590f55d10dd4ce2e00ecf422e38385d3c7bace29 (patch) | |
| tree | a4e07d12b5763bd667438dce18ad092127ec4233 | |
| parent | 427bdf4e2093217f967384f785e3907930a74a21 (diff) | |
| parent | e0ec5d2e8560ae433ee677622b24ba82dbe7630b (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Monitoring/Makefile (renamed from modules/Monitoring/Makefile) | 0 | ||||
| -rw-r--r-- | Monitoring/TODO (renamed from modules/Monitoring/TODO) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/hostgroups_nagios2.cfg (renamed from modules/Monitoring/conf/hostgroups_nagios2.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/krebs_hosts.cfg (renamed from modules/Monitoring/conf/krebs_hosts.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/krebsnet.cfg (renamed from modules/Monitoring/conf/krebsnet.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/localhost.cfg (renamed from modules/Monitoring/conf/localhost.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/other_hosts.cfg (renamed from modules/Monitoring/conf/other_hosts.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/shack_infrastructure.cfg (renamed from modules/Monitoring/conf/shack_infrastructure.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/shacknet.cfg (renamed from modules/Monitoring/conf/shacknet.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/tinc_hosts.cfg (renamed from modules/Monitoring/conf/tinc_hosts.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/conf/tincnet.cfg (renamed from modules/Monitoring/conf/tincnet.cfg) | 0 | ||||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/favicon.ico (renamed from modules/Monitoring/htdocs/images/logos/krebs/favicon.ico) | bin | 822 -> 822 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/krebs.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/krebs.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/krebs.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/krebs.png) | bin | 323 -> 323 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/shack.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/shack.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/shack.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/shack.png) | bin | 316 -> 316 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/tinc.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/tinc.gd2) | bin | 1305 -> 1305 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/tinc.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/tinc.png) | bin | 361 -> 361 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/wireless_access_point.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/wireless_access_point.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/wireless_access_point.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/wireless_access_point.png) | bin | 883 -> 883 bytes | |||
| -rw-r--r-- | Monitoring/htdocs/images/logos/krebs/wireless_access_point_64.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/wireless_access_point_64.png) | bin | 5364 -> 5364 bytes | |||
| -rwxr-xr-x | Monitoring/plugins/check_sip (renamed from modules/Monitoring/plugins/check_sip) | 0 | ||||
| -rwxr-xr-x | bigeye/bigeyed (renamed from modules/bigeye/bigeyed) | 0 | ||||
| -rw-r--r-- | census/Makefile (renamed from modules/people/Makefile) | 0 | ||||
| -rw-r--r-- | census/README.md (renamed from modules/people/README.md) | 0 | ||||
| -rw-r--r-- | census/TODO.md (renamed from modules/people/TODO.md) | 0 | ||||
| -rw-r--r-- | census/VERSION (renamed from modules/people/VERSION) | 0 | ||||
| -rwxr-xr-x | census/arping.py (renamed from modules/people/arping.py) | 0 | ||||
| -rwxr-xr-x | census/arping_users.py (renamed from modules/people/arping_users.py) | 0 | ||||
| -rw-r--r-- | census/mac_names.lst (renamed from modules/people/mac_names.lst) | 0 | ||||
| -rw-r--r-- | infest/Makefile (renamed from modules/infest/Makefile) | 0 | ||||
| -rwxr-xr-x | infest/bin/make-patch (renamed from modules/infest/bin/make-patch) | 0 | ||||
| -rw-r--r-- | infest/bootstrap.sh (renamed from modules/infest/bootstrap.sh) | 0 | ||||
| -rwxr-xr-x | infest/core/angstrom (renamed from modules/infest/core/angstrom) | 0 | ||||
| -rwxr-xr-x | infest/core/debian (renamed from modules/infest/core/debian) | 0 | ||||
| -rw-r--r-- | infest/host-patch/beagleboard/Makefile (renamed from modules/infest/host-patch/beagleboard/Makefile) | 0 | ||||
| -rw-r--r-- | infest/host-patch/beagleboard/profile.patch (renamed from modules/infest/host-patch/beagleboard/profile.patch) | 0 | ||||
| -rw-r--r-- | infest/skel/etc/motd.tail (renamed from modules/infest/skel/etc/motd.tail) | 0 | ||||
| -rwxr-xr-x | infest/skel/etc/profile (renamed from modules/infest/skel/etc/profile) | 0 | ||||
| -rwxr-xr-x | infest/skel/etc/rc.local (renamed from modules/infest/skel/etc/rc.local) | 2 | ||||
| -rw-r--r-- | infest/skel/home/.ssh/authorized_keys (renamed from modules/infest/skel/home/.ssh/authorized_keys) | 0 | ||||
| -rw-r--r-- | infest/skel/home/.vimrc (renamed from modules/infest/skel/home/.vimrc) | 0 | ||||
| -rw-r--r-- | morse/COPYING (renamed from modules/morse/COPYING) | 0 | ||||
| -rw-r--r-- | morse/README (renamed from modules/morse/README) | 0 | ||||
| -rwxr-xr-x | morse/morse.sh (renamed from modules/morse/morse.sh) | 0 | ||||
| -rw-r--r-- | node/Makefile | 8 | ||||
| -rw-r--r-- | noise/Makefile (renamed from modules/noise/Makefile) | 2 | ||||
| -rw-r--r-- | noise/TODO (renamed from modules/noise/TODO) | 0 | ||||
| -rwxr-xr-x | noise/cron/bin/zeit (renamed from modules/noise/cron/bin/zeit) | 2 | ||||
| -rwxr-xr-x | noise/init.d/noise (renamed from modules/noise/init.d/noise) | 2 | ||||
| -rwxr-xr-x | noise/modules/cat (renamed from modules/noise/modules/cat) | 0 | ||||
| -rwxr-xr-x | noise/modules/chat (renamed from modules/noise/modules/chat) | 0 | ||||
| -rwxr-xr-x | noise/modules/date (renamed from modules/noise/modules/date) | 0 | ||||
| -rwxr-xr-x | noise/modules/echo (renamed from modules/noise/modules/echo) | 0 | ||||
| -rwxr-xr-x | noise/modules/ein_mal_eins (renamed from modules/noise/modules/ein_mal_eins) | 0 | ||||
| -rwxr-xr-x | noise/modules/espeak (renamed from modules/noise/modules/espeak) | 0 | ||||
| -rwxr-xr-x | noise/modules/help (renamed from modules/noise/modules/help) | 0 | ||||
| -rwxr-xr-x | noise/modules/join (renamed from modules/noise/modules/join) | 0 | ||||
| -rwxr-xr-x | noise/modules/lang (renamed from modules/noise/modules/lang) | 0 | ||||
| -rwxr-xr-x | noise/modules/mpc (renamed from modules/noise/modules/mpc) | 0 | ||||
| -rwxr-xr-x | noise/modules/names (renamed from modules/noise/modules/names) | 0 | ||||
| -rwxr-xr-x | noise/modules/nick (renamed from modules/noise/modules/nick) | 0 | ||||
| -rwxr-xr-x | noise/modules/part (renamed from modules/noise/modules/part) | 0 | ||||
| -rwxr-xr-x | noise/modules/ping (renamed from modules/noise/modules/ping) | 0 | ||||
| -rwxr-xr-x | noise/modules/play (renamed from modules/noise/modules/play) | 0 | ||||
| -rwxr-xr-x | noise/modules/pong (renamed from modules/noise/modules/pong) | 0 | ||||
| -rwxr-xr-x | noise/modules/query (renamed from modules/noise/modules/query) | 0 | ||||
| -rwxr-xr-x | noise/modules/send_to_channel (renamed from modules/noise/modules/send_to_channel) | 0 | ||||
| -rwxr-xr-x | noise/modules/sendmail (renamed from modules/noise/modules/sendmail) | 0 | ||||
| -rwxr-xr-x | noise/modules/shackstatus (renamed from modules/noise/modules/shackstatus) | 0 | ||||
| -rwxr-xr-x | noise/modules/sleep (renamed from modules/noise/modules/sleep) | 0 | ||||
| -rwxr-xr-x | noise/modules/stream (renamed from modules/noise/modules/stream) | 0 | ||||
| -rwxr-xr-x | noise/modules/temp (renamed from modules/noise/modules/temp) | 2 | ||||
| -rwxr-xr-x | noise/modules/test (renamed from modules/noise/modules/test) | 0 | ||||
| -rwxr-xr-x | noise/modules/twitter (renamed from modules/noise/modules/twitter) | 0 | ||||
| -rwxr-xr-x | noise/modules/vvs (renamed from modules/noise/modules/vvs) | 0 | ||||
| -rwxr-xr-x | noise/modules/wall (renamed from modules/noise/modules/wall) | 0 | ||||
| -rwxr-xr-x | noise/modules/zeit (renamed from modules/noise/modules/zeit) | 0 | ||||
| -rwxr-xr-x | noise/noise (renamed from modules/noise/noise) | 0 | ||||
| -rwxr-xr-x | noise/noise-as-user (renamed from modules/noise/noise-as-user) | 0 | ||||
| -rwxr-xr-x | noise/noise-server (renamed from modules/noise/noise-server) | 0 | ||||
| -rw-r--r-- | retiolum/Makefile (renamed from modules/retiolum/Makefile) | 0 | ||||
| -rw-r--r-- | retiolum/README (renamed from modules/retiolum/README) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/fillxx (renamed from modules/retiolum/bin/fillxx) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/hosts (renamed from modules/retiolum/bin/hosts) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/ipv6 (renamed from modules/retiolum/bin/ipv6) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/tinc (renamed from modules/retiolum/bin/tinc) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/update_tinc_hosts (renamed from modules/retiolum/bin/update_tinc_hosts) | 0 | ||||
| -rw-r--r-- | retiolum/doc/install_dotcloud (renamed from modules/retiolum/doc/install_dotcloud) | 2 | ||||
| -rw-r--r-- | retiolum/doc/install_no.de (renamed from modules/retiolum/doc/install_no.de) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/README (renamed from modules/retiolum/scripts/README) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/adv_graphgen/README (renamed from modules/retiolum/scripts/adv_graphgen/README) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse.py (renamed from modules/retiolum/scripts/adv_graphgen/parse.py) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh (renamed from modules/retiolum/scripts/adv_graphgen/sanitize.sh) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/autostart/Makefile (renamed from modules/retiolum/scripts/autostart/Makefile) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/autostart/tinc (renamed from modules/retiolum/scripts/autostart/tinc) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_multicast/retiolum (renamed from modules/retiolum/scripts/tinc_multicast/retiolum) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_multicast/retiolum.py (renamed from modules/retiolum/scripts/tinc_multicast/retiolum.py) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/README (renamed from modules/retiolum/scripts/tinc_setup/README) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/autoupdate_cron.sh (renamed from modules/retiolum/scripts/tinc_setup/autoupdate_cron.sh) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/bootstrap.sh (renamed from modules/retiolum/scripts/tinc_setup/bootstrap.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/build_arch.sh (renamed from modules/retiolum/scripts/tinc_setup/build_arch.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/build_debian.sh (renamed from modules/retiolum/scripts/tinc_setup/build_debian.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/build_debian_clean.sh (renamed from modules/retiolum/scripts/tinc_setup/build_debian_clean.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/build_ec2.sh (renamed from modules/retiolum/scripts/tinc_setup/build_ec2.sh) | 0 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/build_no.de.sh (renamed from modules/retiolum/scripts/tinc_setup/build_no.de.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh (renamed from modules/retiolum/scripts/tinc_setup/install.sh) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/tinc-up (renamed from modules/retiolum/scripts/tinc_setup/tinc-up) | 2 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/write_channel.py (renamed from modules/retiolum/scripts/tinc_setup/write_channel.py) | 0 | ||||
| -rw-r--r-- | roboctl/index.js | 18 | ||||
| -rw-r--r-- | roboctl/lib/irc.js | 67 | ||||
| -rw-r--r-- | streams/Makefile (renamed from modules/streams/Makefile) | 0 | ||||
| -rw-r--r-- | streams/README (renamed from modules/streams/README) | 0 | ||||
| -rwxr-xr-x | streams/deepmix (renamed from modules/streams/deepmix) | 0 | ||||
| -rwxr-xr-x | streams/groove (renamed from modules/streams/groove) | 0 | ||||
| -rwxr-xr-x | streams/radiotux (renamed from modules/streams/radiotux) | 0 | ||||
| -rw-r--r-- | temper/.gitignore (renamed from modules/temper/.gitignore) | 0 | ||||
| -rw-r--r-- | temper/99-tempsensor.rules (renamed from modules/temper/99-tempsensor.rules) | 0 | ||||
| -rw-r--r-- | temper/Makefile (renamed from modules/temper/Makefile) | 0 | ||||
| -rw-r--r-- | temper/temper.c (renamed from modules/temper/temper.c) | 0 | ||||
| -rw-r--r-- | temper/temper.h (renamed from modules/temper/temper.h) | 0 | ||||
| -rwxr-xr-x | webcams/cam1.sh (renamed from modules/webcams/cam1.sh) | 0 | ||||
| -rw-r--r-- | zoneminder/Makefile (renamed from modules/zoneminder/Makefile) | 0 | ||||
| -rw-r--r-- | zoneminder/zmdc.pl-LD_PRELOAD.patch (renamed from modules/zoneminder/zmdc.pl-LD_PRELOAD.patch) | 0 | ||||
| -rw-r--r-- | zoneminder/zoneminder.conf (renamed from modules/zoneminder/zoneminder.conf) | 0 |
126 files changed, 105 insertions, 12 deletions
@@ -4,16 +4,16 @@ DIST = debian all: select-target infest: - make -C modules/infest + make -C infest install-core: core/$(DIST) |