diff options
| -rw-r--r-- | census/Makefile (renamed from people/Makefile) | 0 | ||||
| -rw-r--r-- | census/README.md (renamed from people/README.md) | 0 | ||||
| -rw-r--r-- | census/TODO.md (renamed from people/TODO.md) | 0 | ||||
| -rw-r--r-- | census/VERSION (renamed from people/VERSION) | 0 | ||||
| -rwxr-xr-x | census/arping.py (renamed from people/arping.py) | 0 | ||||
| -rwxr-xr-x | census/arping_users.py (renamed from people/arping_users.py) | 0 | ||||
| -rw-r--r-- | census/mac_names.lst (renamed from people/mac_names.lst) | 0 | ||||
| -rw-r--r-- | retiolum/Makefile | 17 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse.py | 1 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh | 6 |
10 files changed, 19 insertions, 5 deletions
diff --git a/people/Makefile b/census/Makefile index 2c6c1c03..2c6c1c03 100644 --- a/people/Makefile +++ b/census/Makefile diff --git a/people/README.md b/census/README.md index e45d39c1..e45d39c1 100644 --- a/people/README.md +++ b/census/README.md diff --git a/people/TODO.md b/census/TODO.md index daacfd58..daacfd58 100644 --- a/people/TODO.md +++ b/census/TODO.md diff --git a/people/VERSION b/census/VERSION index 6c50e659..6c50e659 100644 --- a/people/VERSION +++ b/census/VERSION diff --git a/people/arping.py b/census/arping.py index 3245f1ee..3245f1ee 100755 --- a/people/arping.py +++ b/census/arping.py diff --git a/people/arping_users.py b/census/arping_users.py index f0df4924..f0df4924 100755 --- a/people/arping_users.py +++ b/census/arping_users.py diff --git a/people/mac_names.lst b/census/mac_names.lst index 85fbfb25..85fbfb25 100644 --- a/people/mac_names.lst +++ b/census/mac_names.lst diff --git a/retiolum/Makefile b/retiolum/Makefile index 0d99ee70..85020c9f 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -1,6 +1,7 @@ .phony: update it all so install -all: select-target +all: + cat Makefile it: so so: it @@ -8,8 +9,20 @@ so: it /etc/tinc/retiolum/hosts: cd $(dir $@) && git clone https://github.com/krebscode/hosts +#TODO conflicting update: /etc/tinc/retiolum/hosts cd $< && git pull -install: +install: scripts/tinc_setup/install.sh + +autohosts: + @echo creating Magic + bin/update_tinc_hosts "create magic" || true + @echo adding hosts + bin/update_tinc_hosts restart + +arch-install: update install arch-autostart autohosts + +arch-autostart: + make -C scripts/autostart arch diff --git a/retiolum/scripts/adv_graphgen/parse.py b/retiolum/scripts/adv_graphgen/parse.py index 9c2dd051..0744b262 100755 --- a/retiolum/scripts/adv_graphgen/parse.py +++ b/retiolum/scripts/adv_graphgen/parse.py @@ -57,6 +57,7 @@ def write_node(k,v): node +="\"" if v['external-ip'] == "MYSELF": node += ",fillcolor=steelblue1" + node +=",group="+v['external-ip'].replace(".","")+"" node += "]" print node diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 2febc54c..38281fba 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -1,7 +1,7 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo -GRAPH_SETTER3=neato -GRAPH_SETTER3=sfdp +GRAPH_SETTER3='neato -Goverlap=prism ' +GRAPH_SETTER4=sfdp LOG_FILE=/var/log/everything.log OPENER=/bin/true @@ -14,4 +14,4 @@ $GRAPH_SETTER2 -Tpng -o $1retiolum_2.png retiolum.dot $GRAPH_SETTER3 -Tpng -o $1retiolum_3.png retiolum.dot $GRAPH_SETTER4 -Tpng -o $1retiolum_4.png retiolum.dot $OPENER retiolum_1.png &>/dev/null -#rm retiolum.dot +rm retiolum.dot |