diff options
-rw-r--r-- | host_vars/192.168.0.25 | 2 | ||||
-rw-r--r-- | host_vars/192.168.0.26 | 2 | ||||
-rw-r--r-- | host_vars/d72vewh3wa4lwpaj.onion | 2 | ||||
-rw-r--r-- | host_vars/lancaster.casperlefantom.net | 2 | ||||
-rw-r--r-- | host_vars/lancaster.home.casperlefantom.net | 2 | ||||
l---------[-rw-r--r--] | hosts | 20 | ||||
-rw-r--r-- | hosts.net | 17 | ||||
-rw-r--r-- | hosts.tor | 17 | ||||
-rwxr-xr-x | replay | 24 | ||||
-rw-r--r-- | roles/common/tasks/deps.yml | 5 | ||||
-rw-r--r-- | roles/common/tasks/pkgs.yml | 2 | ||||
-rw-r--r-- | roles/dnsserver/files/home.casperlefantom.net.zone | 6 | ||||
-rw-r--r-- | roles/torrelay/templates/torrc.j2 | 16 |
13 files changed, 71 insertions, 46 deletions
diff --git a/host_vars/192.168.0.25 b/host_vars/192.168.0.25 index bdda2bf..8cb7680 100644 --- a/host_vars/192.168.0.25 +++ b/host_vars/192.168.0.25 @@ -5,4 +5,4 @@ bprate: '80 KB' bpburst: '100 KB' is_gardian: true is_mtamaster: true - +is_tormaster: true diff --git a/host_vars/192.168.0.26 b/host_vars/192.168.0.26 index bdda2bf..8cb7680 100644 --- a/host_vars/192.168.0.26 +++ b/host_vars/192.168.0.26 @@ -5,4 +5,4 @@ bprate: '80 KB' bpburst: '100 KB' is_gardian: true is_mtamaster: true - +is_tormaster: true diff --git a/host_vars/d72vewh3wa4lwpaj.onion b/host_vars/d72vewh3wa4lwpaj.onion index bdda2bf..8cb7680 100644 --- a/host_vars/d72vewh3wa4lwpaj.onion +++ b/host_vars/d72vewh3wa4lwpaj.onion @@ -5,4 +5,4 @@ bprate: '80 KB' bpburst: '100 KB' is_gardian: true is_mtamaster: true - +is_tormaster: true diff --git a/host_vars/lancaster.casperlefantom.net b/host_vars/lancaster.casperlefantom.net index bdda2bf..8cb7680 100644 --- a/host_vars/lancaster.casperlefantom.net +++ b/host_vars/lancaster.casperlefantom.net @@ -5,4 +5,4 @@ bprate: '80 KB' bpburst: '100 KB' is_gardian: true is_mtamaster: true - +is_tormaster: true diff --git a/host_vars/lancaster.home.casperlefantom.net b/host_vars/lancaster.home.casperlefantom.net index bdda2bf..8cb7680 100644 --- a/host_vars/lancaster.home.casperlefantom.net +++ b/host_vars/lancaster.home.casperlefantom.net @@ -5,4 +5,4 @@ bprate: '80 KB' bpburst: '100 KB' is_gardian: true is_mtamaster: true - +is_tormaster: true @@ -1,19 +1 @@ -[clients] -3bt4evcfdlpiewcp.onion -onc27ga76nsdpmwc.onion - -[dns] -d72vewh3wa4lwpaj.onion:54444 -gfuzfrkr6mg47ktw.onion:54444 -bpr7drsao5vozzr5.onion -qunkjql4sgxnb6vr.onion:54444 -# manchester -utykfqg7y6ktgvag.onion:54444 - -[update] -3bt4evcfdlpiewcp.onion -onc27ga76nsdpmwc.onion -gfuzfrkr6mg47ktw.onion:54444 -bpr7drsao5vozzr5.onion -d72vewh3wa4lwpaj.onion:54444 -qunkjql4sgxnb6vr.onion:54444 +hosts.tor
\ No newline at end of file diff --git a/hosts.net b/hosts.net new file mode 100644 index 0000000..b870ac4 --- /dev/null +++ b/hosts.net @@ -0,0 +1,17 @@ +[clients] +falcon.home.casperlefantom.net +blackbird.home.casperlefantom.net + +[dns] +lancaster.home.casperlefantom.net:54444 +ns3.casperlefantom.net:54444 +ns4.casperlefantom.net +ns2.casperlefantom.net:54444 + +[update] +falcon.home.casperlefantom.net +blackbird.home.casperlefantom.net +ns3.casperlefantom.net:54444 +ns4.casperlefantom.net +lancaster.home.casperlefantom.net:54444 +ns2.casperlefantom.net:54444 diff --git a/hosts.tor b/hosts.tor new file mode 100644 index 0000000..20bdb85 --- /dev/null +++ b/hosts.tor @@ -0,0 +1,17 @@ +[clients] +3bt4evcfdlpiewcp.onion +onc27ga76nsdpmwc.onion + +[dns] +d72vewh3wa4lwpaj.onion:54444 +gfuzfrkr6mg47ktw.onion:54444 +bpr7drsao5vozzr5.onion +qunkjql4sgxnb6vr.onion:54444 + +[update] +3bt4evcfdlpiewcp.onion +onc27ga76nsdpmwc.onion +gfuzfrkr6mg47ktw.onion:54444 +bpr7drsao5vozzr5.onion +d72vewh3wa4lwpaj.onion:54444 +qunkjql4sgxnb6vr.onion:54444 @@ -6,6 +6,11 @@ SOURCES=$HOME/park-admin/playbooks-ansible WORKDIR=/tmp COUNTLIMIT=10 +# Availables options are: 'clearnet' or 'tornetwork' +NETWORK=clearnet +FORK=8 +TIMEOUT=240 +FLAGS="--force-handlers -f $FORK -T $TIMEOUT" ### # Stop editing, it is ready ### @@ -13,22 +18,31 @@ COUNTLIMIT=10 REPLAY=true COUNT=1 -pushd $WORKDIR +pushd $WORKDIR >/dev/null + +if [[ $NETWORK == "clearnet" ]] +then + CMDLINE=ansible-playbook + HOSTFILE=$SOURCES/hosts.net +elif [[ $NETWORK == "tornetwork" ]] +then + CMDLINE="torsocks ansible-playbook" + HOSTFILE=$SOURCES/hosts.tor +fi while [[ $REPLAY == "true" ]] && [[ $COUNT -lt $COUNTLIMIT ]] do - if ( torsocks ansible-playbook --force-handlers -i $SOURCES/hosts $SOURCES/site.yml ) + if ( $CMDLINE $FLAGS -i $HOSTFILE $SOURCES/site.yml ) then REPLAY=false else - REPLAY=true # no infinite loop COUNT=$((COUNT + 1)) fi done -popd +popd >/dev/null echo "End of Replay" echo "Replay launched $COUNT times" -echo "Have a nice day!" +echo "Have a nice day $USER !" diff --git a/roles/common/tasks/deps.yml b/roles/common/tasks/deps.yml index fbf59ad..5da759c 100644 --- a/roles/common/tasks/deps.yml +++ b/roles/common/tasks/deps.yml @@ -15,10 +15,11 @@ when: ansible_pkg_mgr == "yum" +# after one playbook run, this must be deleted - name: Suppression des conflits - dnf: name=vim-minimal state=absent + dnf: name=vim-enhanced state=absent when: ansible_pkg_mgr == "dnf" - name: Suppression des conflits - yum: name=vim-minimal state=absent + yum: name=vim-enhanced state=absent when: ansible_pkg_mgr == "yum" diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 0e59e54..06c940d 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -12,7 +12,6 @@ - patch - gpm - elinks - - vim-enhanced - mutt - nfs-utils - tcpdump @@ -42,7 +41,6 @@ - patch - gpm - elinks - - vim - mutt - nfs-utils - tcpdump diff --git a/roles/dnsserver/files/home.casperlefantom.net.zone b/roles/dnsserver/files/home.casperlefantom.net.zone index 99648dd..e2840b5 100644 --- a/roles/dnsserver/files/home.casperlefantom.net.zone +++ b/roles/dnsserver/files/home.casperlefantom.net.zone @@ -1,6 +1,6 @@ $ttl 86400 home.casperlefantom.net. IN SOA ns.home.casperlefantom.net. hostmaster.casperlefantom.net. ( -2017051400 +2017062100 10800 3600 604800 @@ -18,8 +18,8 @@ lancaster IN A 192.168.0.25 lancaster IN AAAA 2a01:e35:2f76:7750::4 * IN CNAME lancaster -blackbird IN A 192.168.0.51 -blackbird IN AAAA 2a01:e35:2f76:7750::2 +blackbird IN A 10.42.0.51 + mosquito IN A 192.168.0.52 mosquito IN AAAA 2a01:e35:2f76:7750::3 diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index 83eb3fd..bbc4fdd 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -14,15 +14,17 @@ HiddenServicePort 22 127.0.0.1:22 HiddenServicePort 54444 127.0.0.1:54444 -{% if ansible_hostname == "lancaster" %} -HiddenServicePort 9030 127.0.0.1:9030 +{% if ansible_distribution == "Fedora" %} +HiddenServicePort 9090 127.0.0.1:9090 +{% endif %} + + +{% if is_tormaster is defined %} HiddenServicePort 80 127.0.0.1:4433 HiddenServicePort 143 127.0.0.1:143 HiddenServicePort 993 127.0.0.1:993 HiddenServicePort 25 127.0.0.1:25 HiddenServicePort 587 127.0.0.1:587 -HiddenServicePort 5222 127.0.0.1:5222 -HiddenServicePort 9090 127.0.0.1:9090 HiddenServiceDir /var/lib/tor/hidden_service2/ HiddenServicePort 80 127.0.0.1:4433 HiddenServiceDir /var/lib/tor/hidden_service3/ @@ -35,12 +37,6 @@ HiddenServicePort 80 127.0.0.1:4433 {% endif %} -{% if ansible_hostname == "sd-38449" %} -HiddenServicePort 80 127.0.0.1:80 -HiddenServicePort 443 127.0.0.1:443 -{% endif %} - - {% if is_public is defined %} ORPort {{ orport }} |