From b895c26cd939ce3d531ae1b74e3d4a96b6b2a417 Mon Sep 17 00:00:00 2001
From: Felix Richter <Felix.Richter@syntax-fehler.de>
Date: Sun, 29 May 2011 14:17:23 +0200
Subject: README: initial commit

---
 cholerab/README | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 cholerab/README

(limited to 'cholerab/README')

diff --git a/cholerab/README b/cholerab/README
new file mode 100644
index 00000000..f943b315
--- /dev/null
+++ b/cholerab/README
@@ -0,0 +1,38 @@
+
+~/p/krebscode/painload/infest/home
+  aggressive
+  cooperative
+  -- currently it is aggressive and stupid
+
+~/p/krebscode/painload/infest/etc
+  aggressive
+  cooperative
+  -- currently it is aggressive and stupid
+
+
+- node install script
+
+
+===
+
+ssh root@pornocauster -p 2222
+git clone https://github.com/krebscode/painload.git /krebs
+cd /krebs
+apt-get install --yes make
+make infest
+shutdown -r now
+
+ssh -i .ssh/krebs/also.id_rsa krebs@pornocauster -p 2222
+
+===
+- conflicting ~/.profile
+- morse: beep not found wegen rc.local
+- /etc/.vimrc legacy compat
+
+
+~/p/krebscode/painload/node/Makefile
+  ./configure --prefix=$HOME
+  and ensure that the resulting bin is in $PATH
+  which node or build
+
+
-- 
cgit v1.2.3


From ec4124e06ea384b1264760c6d316d941274c1f6d Mon Sep 17 00:00:00 2001
From: Felix Richter <Felix.Richter@syntax-fehler.de>
Date: Mon, 30 May 2011 01:06:46 +0200
Subject: updated todos for krebs/upm

UMP: TODO file, use grep to find your action-points (tv,pfleidi,makefu)
README:
---
 cholerab/README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cholerab/README')

diff --git a/cholerab/README b/cholerab/README
index f943b315..eb2e23df 100644
--- a/cholerab/README
+++ b/cholerab/README
@@ -24,7 +24,8 @@ shutdown -r now
 
 ssh -i .ssh/krebs/also.id_rsa krebs@pornocauster -p 2222
 
-===
+=== 
+
 - conflicting ~/.profile
 - morse: beep not found wegen rc.local
 - /etc/.vimrc legacy compat
-- 
cgit v1.2.3


From 53831e7260669e8788f75d39b881812a09c756c4 Mon Sep 17 00:00:00 2001
From: root <root@krebs>
Date: Tue, 31 May 2011 16:16:10 +0200
Subject: bump!

---
 cholerab/README | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

(limited to 'cholerab/README')

diff --git a/cholerab/README b/cholerab/README
index f943b315..69574f69 100644
--- a/cholerab/README
+++ b/cholerab/README
@@ -14,15 +14,17 @@
 
 
 ===
-
-ssh root@pornocauster -p 2222
-git clone https://github.com/krebscode/painload.git /krebs
-cd /krebs
-apt-get install --yes make
-make infest
-shutdown -r now
-
-ssh -i .ssh/krebs/also.id_rsa krebs@pornocauster -p 2222
+# this is the current installation process [by example]
+<code>
+  ssh root@pornocauster -p 2222
+  git clone https://github.com/krebscode/painload.git /krebs
+  cd /krebs
+  apt-get install --yes make
+  make infest
+  shutdown -r now
+  
+  ssh -i .ssh/krebs/also.id_rsa krebs@pornocauster -p 2222
+</code>
 
 ===
 - conflicting ~/.profile
@@ -36,3 +38,25 @@ ssh -i .ssh/krebs/also.id_rsa krebs@pornocauster -p 2222
   which node or build
 
 
+//krebscode/painload/retiolum/scripts/tinc_setup/install.sh or something
+  should be called by painload/infest
+  and should be enterprise enough to be infested multiple times
+  -- please see how infest/bin/make-patch is generating a patch, that gets
+     applied by Makefile
+
+//krebscode/painload/noise
+  - should be infested host-specifically
+    - i.e. to start automatically at KREBS
+
+//krebscode/painload/noise
+  - NOISE-STREAMS-MODULE
+    - should have a module to allow switching of the streams
+    - should have a module to allow managing of streams
+    - is this mergable with noise/modules/stream [by chris]
+      - or can we replace noise/modules/stream
+
+//krebscode/painload/streams
+  - should be infested host-specifically
+    - i.e. to start automatically at KREBS
+    - the last stream should be playbacked
+    - should be controlable by noise [see NOISE-STREAM-MODULE]
-- 
cgit v1.2.3


From 48681b3db3f9038512eb293b364f537ff480f4d9 Mon Sep 17 00:00:00 2001
From: tv <tv@also>
Date: Sat, 6 Aug 2011 00:59:46 +0200
Subject: cholerab README: add conflicts

---
 cholerab/README | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'cholerab/README')

diff --git a/cholerab/README b/cholerab/README
index d6149751..7b53aeaa 100644
--- a/cholerab/README
+++ b/cholerab/README
@@ -61,3 +61,12 @@
     - i.e. to start automatically at KREBS
     - the last stream should be playbacked
     - should be controlable by noise [see NOISE-STREAM-MODULE]
+
+
+## merge conflicts below
+view.py: contains view classes for cholerab
+cholerab.py: main file
+
+start with :
+python cholerab.py
+
-- 
cgit v1.2.3