summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@also>2011-05-26 12:49:11 +0200
committertv <tv@also>2011-05-26 12:49:11 +0200
commit8c62e86262ba910a1d3ef4870ce5343dc4e2fefb (patch)
treef074d8ea9f54a5ae90177b2c426aa36d89c0a131
parentc72d4dbfbbe0f15dfbdd894c186121f4dc2f20ff (diff)
parent231c96d75699738792e7235dc39b6c5a87e00b83 (diff)
Merge branch 'master' of github.com:krebscode/painload
-rw-r--r--Makefile21
-rwxr-xr-x[-rw-r--r--]core/angstrom1
-rwxr-xr-xcore/debian6
-rwxr-xr-xinfest/etc_aggressive2
4 files changed, 18 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 7e5641e3..50e94bd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
-
+DIST = debian
.PHONY: all
all: select-target
-.PHONY: aggressive
-.PHONY: coop
-.PHONY: infest
+.PHONY: infest aggressive coop
+
infest: aggressive
aggressive:
infest/etc_aggressive
@@ -14,12 +13,14 @@ coop:
infest/etc_coop
infest/home
-install-debian:
- [ `which git` ] || apt-get install git-core
- [ `which tmux` ] || apt-get install tmux
- [ `which screen` ] && apt-get remote screen
- [ `which vim` ] || apt-get install vim
+install-core:
+ core/$(DIST)
noise:
make -C modules/noise infest
-
+streams:
+ make -C modules/streams
+monitoring:
+ make -C modules/Monitoring debian
+zoneminder:
+ make -C modules/zoneminder fix it so hard
diff --git a/core/angstrom b/core/angstrom
index d89d5b32..dafb840f 100644..100755
--- a/core/angstrom
+++ b/core/angstrom
@@ -2,4 +2,3 @@
opkg install vim vim-syntax
opkg install git
-
diff --git a/core/debian b/core/debian
new file mode 100755
index 00000000..fedd1ede
--- /dev/null
+++ b/core/debian
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -x
+[ `which git` ] || apt-get install --yes git-core
+[ `which tmux` ] || apt-get install --yes tmux
+[ `which screen` ] && apt-get remote --yes screen
+[ `which vim` ] || apt-get install --yes vim
diff --git a/infest/etc_aggressive b/infest/etc_aggressive
index c21f5d16..8fa2a570 100755
--- a/infest/etc_aggressive
+++ b/infest/etc_aggressive
@@ -1,7 +1,7 @@
#! /bin/sh
#prereqs
-/krebs/infest/etc_coexistential
+/krebs/infest/coop
f=/etc/passwd
sed -ri 's^(root:[^:]+):0:0:(.*)$\1:23:23:\2' $f