summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile10
-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)bin822 -> 822 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/krebs.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/krebs.gd2)bin1047 -> 1047 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/krebs.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/krebs.png)bin323 -> 323 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/shack.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/shack.gd2)bin1047 -> 1047 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/shack.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/shack.png)bin316 -> 316 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/tinc.gd2 (renamed from modules/Monitoring/htdocs/images/logos/krebs/tinc.gd2)bin1305 -> 1305 bytes
-rw-r--r--Monitoring/htdocs/images/logos/krebs/tinc.png (renamed from modules/Monitoring/htdocs/images/logos/krebs/tinc.png)bin361 -> 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)bin1047 -> 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)bin883 -> 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)bin5364 -> 5364 bytes
-rwxr-xr-xMonitoring/plugins/check_sip (renamed from modules/Monitoring/plugins/check_sip)0
-rwxr-xr-xbigeye/bigeyed (renamed from modules/bigeye/bigeyed)0
-rw-r--r--infest/Makefile (renamed from modules/infest/Makefile)0
-rwxr-xr-xinfest/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-xinfest/core/angstrom (renamed from modules/infest/core/angstrom)0
-rwxr-xr-xinfest/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-xinfest/skel/etc/profile (renamed from modules/infest/skel/etc/profile)0
-rwxr-xr-xinfest/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-xmorse/morse.sh (renamed from modules/morse/morse.sh)0
-rw-r--r--node/Makefile (renamed from modules/node/Makefile)0
-rw-r--r--noise/Makefile (renamed from modules/noise/Makefile)2
-rw-r--r--noise/TODO (renamed from modules/noise/TODO)0
-rwxr-xr-xnoise/cron/bin/zeit (renamed from modules/noise/cron/bin/zeit)2
-rwxr-xr-xnoise/init.d/noise (renamed from modules/noise/init.d/noise)2
-rwxr-xr-xnoise/modules/cat (renamed from modules/noise/modules/cat)0
-rwxr-xr-xnoise/modules/chat (renamed from modules/noise/modules/chat)0
-rwxr-xr-xnoise/modules/date (renamed from modules/noise/modules/date)0
-rwxr-xr-xnoise/modules/echo (renamed from modules/noise/modules/echo)0
-rwxr-xr-xnoise/modules/ein_mal_eins (renamed from modules/noise/modules/ein_mal_eins)0
-rwxr-xr-xnoise/modules/espeak (renamed from modules/noise/modules/espeak)0
-rwxr-xr-xnoise/modules/help (renamed from modules/noise/modules/help)0
-rwxr-xr-xnoise/modules/join (renamed from modules/noise/modules/join)0
-rwxr-xr-xnoise/modules/lang (renamed from modules/noise/modules/lang)0
-rwxr-xr-xnoise/modules/mpc (renamed from modules/noise/modules/mpc)0
-rwxr-xr-xnoise/modules/names (renamed from modules/noise/modules/names)0
-rwxr-xr-xnoise/modules/nick (renamed from modules/noise/modules/nick)0
-rwxr-xr-xnoise/modules/part (renamed from modules/noise/modules/part)0
-rwxr-xr-xnoise/modules/ping (renamed from modules/noise/modules/ping)0
-rwxr-xr-xnoise/modules/play (renamed from modules/noise/modules/play)0
-rwxr-xr-xnoise/modules/pong (renamed from modules/noise/modules/pong)0
-rwxr-xr-xnoise/modules/query (renamed from modules/noise/modules/query)0
-rwxr-xr-xnoise/modules/send_to_channel (renamed from modules/noise/modules/send_to_channel)0
-rwxr-xr-xnoise/modules/sendmail (renamed from modules/noise/modules/sendmail)0
-rwxr-xr-xnoise/modules/shackstatus (renamed from modules/noise/modules/shackstatus)0
-rwxr-xr-xnoise/modules/sleep (renamed from modules/noise/modules/sleep)0
-rwxr-xr-xnoise/modules/stream (renamed from modules/noise/modules/stream)0
-rwxr-xr-xnoise/modules/temp (renamed from modules/noise/modules/temp)2
-rwxr-xr-xnoise/modules/test (renamed from modules/noise/modules/test)0
-rwxr-xr-xnoise/modules/twitter (renamed from modules/noise/modules/twitter)0
-rwxr-xr-xnoise/modules/vvs (renamed from modules/noise/modules/vvs)0
-rwxr-xr-xnoise/modules/wall (renamed from modules/noise/modules/wall)0
-rwxr-xr-xnoise/modules/zeit (renamed from modules/noise/modules/zeit)0
-rwxr-xr-xnoise/noise (renamed from modules/noise/noise)0
-rwxr-xr-xnoise/noise-as-user (renamed from modules/noise/noise-as-user)0
-rwxr-xr-xnoise/noise-server (renamed from modules/noise/noise-server)0
-rw-r--r--people/Makefile (renamed from modules/people/Makefile)0
-rw-r--r--people/README.md (renamed from modules/people/README.md)0
-rw-r--r--people/TODO.md (renamed from modules/people/TODO.md)0
-rw-r--r--people/VERSION (renamed from modules/people/VERSION)0
-rwxr-xr-xpeople/arping.py (renamed from modules/people/arping.py)0
-rwxr-xr-xpeople/arping_users.py (renamed from modules/people/arping_users.py)0
-rw-r--r--people/mac_names.lst (renamed from modules/people/mac_names.lst)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-xretiolum/bin/fillxx (renamed from modules/retiolum/bin/fillxx)0
-rwxr-xr-xretiolum/bin/hosts (renamed from modules/retiolum/bin/hosts)0
-rwxr-xr-xretiolum/bin/ipv6 (renamed from modules/retiolum/bin/ipv6)0
-rwxr-xr-xretiolum/bin/tinc (renamed from modules/retiolum/bin/tinc)0
-rwxr-xr-xretiolum/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-xretiolum/scripts/adv_graphgen/parse.py (renamed from modules/retiolum/scripts/adv_graphgen/parse.py)0
-rwxr-xr-xretiolum/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-xretiolum/scripts/autostart/tinc (renamed from modules/retiolum/scripts/autostart/tinc)0
-rwxr-xr-xretiolum/scripts/tinc_multicast/retiolum (renamed from modules/retiolum/scripts/tinc_multicast/retiolum)0
-rwxr-xr-xretiolum/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-xretiolum/scripts/tinc_setup/build_arch.sh (renamed from modules/retiolum/scripts/tinc_setup/build_arch.sh)0
-rwxr-xr-xretiolum/scripts/tinc_setup/build_debian.sh (renamed from modules/retiolum/scripts/tinc_setup/build_debian.sh)0
-rwxr-xr-xretiolum/scripts/tinc_setup/build_debian_clean.sh (renamed from modules/retiolum/scripts/tinc_setup/build_debian_clean.sh)0
-rwxr-xr-xretiolum/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-xretiolum/scripts/tinc_setup/install.sh (renamed from modules/retiolum/scripts/tinc_setup/install.sh)0
-rwxr-xr-xretiolum/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 (renamed from modules/roboctl/index.js)0
-rw-r--r--roboctl/lib/irc.js (renamed from modules/roboctl/lib/irc.js)0
-rw-r--r--streams/Makefile (renamed from modules/streams/Makefile)0
-rw-r--r--streams/README (renamed from modules/streams/README)0
-rwxr-xr-xstreams/deepmix (renamed from modules/streams/deepmix)0
-rwxr-xr-xstreams/groove (renamed from modules/streams/groove)0
-rwxr-xr-xstreams/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-xwebcams/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, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 4e8a8e65..188e6ca2 100644
--- a/Makefile
+++ b/Makefile
@@ -4,16 +4,16 @@ DIST = debian
all: select-target
infest:
- make -C modules/infest
+ make -C infest
install-core:
core/$(DIST)
noise:
- make -C modules/noise infest
+ make -C noise infest
streams:
- make -C modules/streams
+ make -C streams
monitoring:
- make -C modules/Monitoring debian
+ make -C Monitoring debian
zoneminder:
- make -C modules/zoneminder fix it so hard
+ make -C zoneminder fix it so hard
diff --git a/modules/Monitoring/Makefile b/Monitoring/Makefile
index cc1d8903..cc1d8903 100644
--- a/modules/Monitoring/Makefile
+++ b/Monitoring/Makefile
diff --git a/modules/Monitoring/TODO b/Monitoring/TODO
index 6d74fdcd..6d74fdcd 100644
--- a/modules/Monitoring/TODO
+++ b/Monitoring/TODO
diff --git a/modules/Monitoring/conf/hostgroups_nagios2.cfg b/Monitoring/conf/hostgroups_nagios2.cfg
index 63acbf50..63acbf50 100644
--- a/modules/Monitoring/conf/hostgroups_nagios2.cfg
+++ b/Monitoring/conf/hostgroups_nagios2.cfg
diff --git a/modules/Monitoring/conf/krebs_hosts.cfg b/Monitoring/conf/krebs_hosts.cfg
index a929fa19..a929fa19 100644
--- a/modules/Monitoring/conf/krebs_hosts.cfg
+++ b/Monitoring/conf/krebs_hosts.cfg
diff --git a/modules/Monitoring/conf/krebsnet.cfg b/Monitoring/conf/krebsnet.cfg
index ae5b898e..ae5b898e 100644
--- a/modules/Monitoring/conf/krebsnet.cfg
+++ b/Monitoring/conf/krebsnet.cfg
diff --git a/modules/Monitoring/conf/localhost.cfg b/Monitoring/conf/localhost.cfg
index 3b098195..3b098195 100644
--- a/modules/Monitoring/conf/localhost.cfg
+++ b/Monitoring/conf/localhost.cfg
diff --git a/modules/Monitoring/conf/other_hosts.cfg b/Monitoring/conf/other_hosts.cfg
index bfc36154..bfc36154 100644
--- a/modules/Monitoring/conf/other_hosts.cfg
+++ b/Monitoring/conf/other_hosts.cfg
diff --git a/modules/Monitoring/conf/shack_infrastructure.cfg b/Monitoring/conf/shack_infrastructure.cfg
index dd123dc3..dd123dc3 100644
--- a/modules/Monitoring/conf/shack_infrastructure.cfg
+++ b/Monitoring/conf/shack_infrastructure.cfg
diff --git a/modules/Monitoring/conf/shacknet.cfg b/Monitoring/conf/shacknet.cfg
index 7658ab80..7658ab80 100644
--- a/modules/Monitoring/conf/shacknet.cfg
+++ b/