diff options
author | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
---|---|---|
committer | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
commit | a2195f3c9f382acebcf49b3043944f34609e4550 (patch) | |
tree | c542ab73193cd81ecd6482806c05b2fb6560cdae /minikrebs/profiles/krebs | |
parent | b6144a1e1b24a82d479741edd12fa3ad7a744c58 (diff) | |
parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'minikrebs/profiles/krebs')
-rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/config/tinc | 2 | ||||
l--------- | minikrebs/profiles/krebs/customfiles/etc/rc.d/tinc | 1 | ||||
-rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/rc.local | 5 | ||||
-rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/shadow | 2 | ||||
-rw-r--r-- | minikrebs/profiles/krebs/doc/README.md | 2 |
5 files changed, 5 insertions, 7 deletions
diff --git a/minikrebs/profiles/krebs/customfiles/etc/config/tinc b/minikrebs/profiles/krebs/customfiles/etc/config/tinc deleted file mode 100644 index 3a03196c..00000000 --- a/minikrebs/profiles/krebs/customfiles/etc/config/tinc +++ /dev/null @@ -1,2 +0,0 @@ -config tinc-net retiolum - option enabled 1 diff --git a/minikrebs/profiles/krebs/customfiles/etc/rc.d/tinc b/minikrebs/profiles/krebs/customfiles/etc/rc.d/tinc deleted file mode 120000 index f08fe11d..00000000 --- a/minikrebs/profiles/krebs/customfiles/etc/rc.d/tinc +++ /dev/null @@ -1 +0,0 @@ -../init.d/tinc
\ No newline at end of file diff --git a/minikrebs/profiles/krebs/customfiles/etc/rc.local b/minikrebs/profiles/krebs/customfiles/etc/rc.local index 1f907dcb..001b873f 100644 --- a/minikrebs/profiles/krebs/customfiles/etc/rc.local +++ b/minikrebs/profiles/krebs/customfiles/etc/rc.local @@ -1,3 +1,4 @@ -/usr/bin/genhostid -[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest & +tincd -n retiolum exit 0 diff --git a/minikrebs/profiles/krebs/customfiles/etc/shadow b/minikrebs/profiles/krebs/customfiles/etc/shadow index 251abaf5..9cc800dd 100644 --- a/minikrebs/profiles/krebs/customfiles/etc/shadow +++ b/minikrebs/profiles/krebs/customfiles/etc/shadow @@ -1,4 +1,4 @@ -root:$1$spkPLKf6$KEM1l1DgouvYjeBfkT2wW1:0:0:99999:7::: +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: daemon:*:0:0:99999:7::: ftp:*:0:0:99999:7::: network:*:0:0:99999:7::: diff --git a/minikrebs/profiles/krebs/doc/README.md b/minikrebs/profiles/krebs/doc/README.md index 0d56524e..1cb1d2be 100644 --- a/minikrebs/profiles/krebs/doc/README.md +++ b/minikrebs/profiles/krebs/doc/README.md @@ -1,7 +1,7 @@ # Krebs Profile This is the base profile for krebs nodes. Copy it to create cool krebs images. - +Core feature is the automatic connection to the retiolum darknet. # Hard Package dependencies Make sure to include them in custom\_make |