diff options
18 files changed, 97 insertions, 40 deletions
diff --git a/host_vars/109.238.2.79 b/host_vars/109.238.2.79 new file mode 100644 index 0000000..42b84df --- /dev/null +++ b/host_vars/109.238.2.79 @@ -0,0 +1,4 @@ +nickname: Casper02 +is_gardian: true +bprate: '100 MB' +bpburst: '120 MB' diff --git a/host_vars/lancaster.home.casperlefantom.net b/host_vars/lancaster.home.casperlefantom.net new file mode 100644 index 0000000..554bef8 --- /dev/null +++ b/host_vars/lancaster.home.casperlefantom.net @@ -0,0 +1,6 @@ +is_dnsmaster: true +nickname: Casper01 +bprate: '80 KB' +bpburst: '100 KB' +is_gardian: true + diff --git a/host_vars/ns2.casperlefantom.net b/host_vars/ns2.casperlefantom.net new file mode 100644 index 0000000..42b84df --- /dev/null +++ b/host_vars/ns2.casperlefantom.net @@ -0,0 +1,4 @@ +nickname: Casper02 +is_gardian: true +bprate: '100 MB' +bpburst: '120 MB' diff --git a/host_vars/qunkjql4sgxnb6vr.onion b/host_vars/qunkjql4sgxnb6vr.onion new file mode 100644 index 0000000..42b84df --- /dev/null +++ b/host_vars/qunkjql4sgxnb6vr.onion @@ -0,0 +1,4 @@ +nickname: Casper02 +is_gardian: true +bprate: '100 MB' +bpburst: '120 MB' @@ -6,6 +6,7 @@ onc27ga76nsdpmwc.onion d72vewh3wa4lwpaj.onion:54444 gfuzfrkr6mg47ktw.onion bpr7drsao5vozzr5.onion +qunkjql4sgxnb6vr.onion:54444 [update] 3bt4evcfdlpiewcp.onion @@ -13,8 +14,4 @@ onc27ga76nsdpmwc.onion gfuzfrkr6mg47ktw.onion bpr7drsao5vozzr5.onion d72vewh3wa4lwpaj.onion:54444 - -[reboot] -gfuzfrkr6mg47ktw.onion -bpr7drsao5vozzr5.onion - +qunkjql4sgxnb6vr.onion:54444 diff --git a/playbooks/update.yml b/playbooks/update.yml index 844bb2d..7298766 100644 --- a/playbooks/update.yml +++ b/playbooks/update.yml @@ -5,11 +5,9 @@ tasks: - name: Mise à jour système avec yum yum: name=* state=latest - register: update1 when: ansible_pkg_mgr == "yum" - name: Mise à jour système avec dnf dnf: name=* state=latest - register: update2 when: ansible_pkg_mgr == "dnf" diff --git a/roles/clients/tasks/mnt.yml b/roles/clients/tasks/mnt.yml index e5451b6..adad909 100644 --- a/roles/clients/tasks/mnt.yml +++ b/roles/clients/tasks/mnt.yml @@ -13,3 +13,9 @@ - /mnt/lv6/ - /mnt/lv7/ - /mnt/lv8/ + - /mnt/lv9/ + - /mnt/lv10/ + - /mnt/lv11/ + - /mnt/lv12/ + - /mnt/lv13/ + - /mnt/lv14/ diff --git a/roles/common/files/emacs.rc b/roles/common/files/emacs.rc index 9a3d9fa..fd0bb0f 100644 --- a/roles/common/files/emacs.rc +++ b/roles/common/files/emacs.rc @@ -90,3 +90,7 @@ ;; compile command (global-set-key (kbd "M-!") 'compile) + + +;; backup in one place. flat, no tree structure +(setq backup-directory-alist '(("" . "~/.emacs.d/emacs-backup"))) diff --git a/roles/common/tasks/repos.yml b/roles/common/tasks/repos.yml index 27a5ab6..acbae9b 100644 --- a/roles/common/tasks/repos.yml +++ b/roles/common/tasks/repos.yml @@ -84,3 +84,11 @@ copy: src=fedora-fantom-hidden.repo dest=/etc/yum.repos.d/fedora-fantom-hidden.repo when: ansible_distribution_version|int >= 24 and ansible_architecture == "x86_64" and ansible_distribution_release != "Rawhide" + +- name: Installation du dépôt EPEL pour Centos + yum: name=epel-release state=present + when: ansible_distribution == "CentOS" and ansible_pkg_mgr == "yum" + +- name: Installation du dépôt EPEL pour Centos + dnf: name=epel-release state=present + when: ansible_distribution == "CentOS" and ansible_pkg_mgr == "dnf" diff --git a/roles/dnsserver/files/194.111.170.178.in-addr.arpa.zone b/roles/dnsserver/files/79.2.238.109.in-addr.arpa.zone index 93649cf..5c74bcd 100644 --- a/roles/dnsserver/files/194.111.170.178.in-addr.arpa.zone +++ b/roles/dnsserver/files/79.2.238.109.in-addr.arpa.zone @@ -1,6 +1,6 @@ $ttl 86400 @ IN SOA ns1.casperlefantom.net. hostmaster.casperlefantom.net. ( - 2014060901; + 2017042702; 28800; 604800; 604800; diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone index 2ef4fe6..00b7645 100644 --- a/roles/dnsserver/files/casperlefantom.net.zone +++ b/roles/dnsserver/files/casperlefantom.net.zone @@ -1,18 +1,20 @@ $ttl 86400 casperlefantom.net. IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. ( -2016120412 +2017042704 10800 3600 604800 38400 ) @ IN NS nsa.casperlefantom.net. +@ IN NS nsb.casperlefantom.net. @ IN NS nsc.casperlefantom.net. @ IN NS nsd.casperlefantom.net. home IN NS ns.home.casperlefantom.net. admin IN NS ns.admin.casperlefantom.net. vpn IN NS nsa.vpn.casperlefantom.net. vpn IN NS nsb.vpn.casperlefantom.net. +vpn IN NS nsc.vpn.casperlefantom.net. @ IN MX 10 mail.casperlefantom.net. @@ -34,6 +36,7 @@ ns.admin.casperlefantom.net. IN AAAA 2a01:e35:2f76:7750::4 vpn IN A 172.18.2.0 nsa.vpn.casperlefantom.net. IN A 172.18.2.0 nsb.vpn.casperlefantom.net. IN A 172.18.3.0 +nsc.vpn.casperlefantom.net. IN A 172.18.4.0 www IN A 82.247.103.117 @@ -78,23 +81,23 @@ search IN A 195.154.75.244 ssl IN A 82.247.103.117 ssl IN AAAA 2a01:e35:2f76:7750::4 -ns2 IN A 178.170.111.194 -ns2 IN AAAA 2a00:c70:1:178:170:111:194:c0de +ns2 IN A 109.238.2.79 +ns2 IN AAAA 2a00:c70:1:109:238:2:79:c0de -nsb IN A 178.170.111.194 -nsb IN AAAA 2a00:c70:1:178:170:111:194:c0de +nsb IN A 109.238.2.79 +nsb IN AAAA 2a00:c70:1:109:238:2:79:c0de -ntp2 IN A 178.170.111.194 -ntp2 IN AAAA 2a00:c70:1:178:170:111:194:c0de +ntp2 IN A 109.238.2.79 +ntp2 IN AAAA 2a00:c70:1:109:238:2:79:c0de bank IN A 82.247.103.117 bank IN AAAA 2a01:e35:2f76:7750::4 -blog IN A 82.247.103.117 -blog IN AAAA 2a01:e35:2f76:7750::4 +blog IN A 195.154.75.244 -69656hpv111194 IN A 178.170.111.194 -69656hpv111194 IN AAAA 2a00:c70:1:178:170:111:194:c0de + +111281hpv002079 IN A 109.238.2.79 +111281hpv002079 IN AAAA 2a00:c70:1:109:238:2:79:c0de vps128389 IN A 176.31.191.26 vps128389 IN AAAA 2001:41d0:52:100::f2 @@ -121,3 +124,26 @@ nsd IN A 195.154.75.244 ntp4 IN A 195.154.75.244 + + +casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" +blog.casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" + +dl.casperlefantom.net. TXT "mwyjtiphky5em4yp.onion" +mirror.casperlefantom.net. TXT "pmstfd4f6s5bm2xq.onion" + +ns1.casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" +nsa.casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" +lancaster.casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" + +ns2.casperlefantom.net. TXT "qunkjql4sgxnb6vr.onion" +nsb.casperlefantom.net. TXT "qunkjql4sgxnb6vr.onion" +111281hpv002079.casperlefantom.net. TXT "qunkjql4sgxnb6vr.onion" + +ns3.casperlefantom.net. TXT "gfuzfrkr6mg47ktw.onion" +nsc.casperlefantom.net. TXT "gfuzfrkr6mg47ktw.onion" +vps128389.casperlefantom.net. TXT "gfuzfrkr6mg47ktw.onion" + +ns4.casperlefantom.net. TXT "bpr7drsao5vozzr5.onion" +nsd.casperlefantom.net. TXT "bpr7drsao5vozzr5.onion" +sd-38449.casperlefantom.net. TXT "bpr7drsao5vozzr5.onion" diff --git a/roles/dnsserver/files/e.d.0.c.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone b/roles/dnsserver/files/e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone index 93649cf..5c74bcd 100644 --- a/roles/dnsserver/files/e.d.0.c.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone +++ b/roles/dnsserver/files/e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone @@ -1,6 +1,6 @@ $ttl 86400 @ IN SOA ns1.casperlefantom.net. hostmaster.casperlefantom.net. ( - 2014060901; + 2017042702; 28800; 604800; 604800; diff --git a/roles/dnsserver/files/home.casperlefantom.net.zone b/roles/dnsserver/files/home.casperlefantom.net.zone index b0c6bfe..10c6dbc 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. ( -2016120400 +2017042801 10800 3600 604800 @@ -38,3 +38,10 @@ vm03 IN AAAA 2a01:e35:2f76:7750::12 mirror IN A 192.168.0.25 mirror IN AAAA 2a01:e35:2f76:7750::4 + + +lancaster.home.casperlefantom.net. TXT "d72vewh3wa4lwpaj.onion" + +blackbird.home.casperlefantom.net. TXT "onc27ga76nsdpmwc.onion" + +falcon.home.casperlefantom.net. TXT "3bt4evcfdlpiewcp.onion" diff --git a/roles/dnsserver/tasks/config.yml b/roles/dnsserver/tasks/config.yml index 2f8655a..7230376 100644 --- a/roles/dnsserver/tasks/config.yml +++ b/roles/dnsserver/tasks/config.yml @@ -23,8 +23,8 @@ - 4.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa.zone - 5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa.zone - 117.103.247.82.in-addr.arpa.zone - - e.d.0.c.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone - - 194.111.170.178.in-addr.arpa.zone + - e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa.zone + - 79.2.238.109.in-addr.arpa.zone - 26.191.31.176.in-addr.arpa.zone - 2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa.zone - 216.82.26.93.in-addr.arpa.zone diff --git a/roles/dnsserver/vars/main.yml b/roles/dnsserver/vars/main.yml index 318244b..51fff73 100644 --- a/roles/dnsserver/vars/main.yml +++ b/roles/dnsserver/vars/main.yml @@ -1,8 +1,8 @@ master_ipv4: 82.247.103.117 master_ipv6: 2a01:e35:2f76:7750::4 -slave1_ipv4: 178.170.111.194 -slave1_ipv6: 2a00:c70:1:178:170:111:194:c0de +slave1_ipv4: 109.238.2.79 +slave1_ipv6: 2a00:c70:1:109:238:2:79:c0de slave2_ipv4: 192.168.0.61 slave2_ipv6: 2a01:e35:2f76:7750::11 @@ -22,7 +22,7 @@ whitelist: - 172.18.0.0/16 - 2a01:e35:2f76:7750::/64 - 82.247.103.117 - - 2a00:c70:1:178:170:111:194:c0de + - 2a00:c70:1:109:238:2:79:c0de - 2a01:e35:399c:8f80::/64 - 83.153.200.248 - 2001:41d0:52:100::f2 @@ -41,8 +41,8 @@ zonelist: - 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa - 3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa - 5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.5.7.7.6.7.f.2.5.3.e.0.1.0.a.2.ip6.arpa - - 194.111.170.178.in-addr.arpa - - e.d.0.c.4.9.1.0.1.1.1.0.0.7.1.0.8.7.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa + - 79.2.238.109.in-addr.arpa + - e.d.0.c.9.7.0.0.2.0.0.0.8.3.2.0.9.0.1.0.1.0.0.0.0.7.c.0.0.0.a.2.ip6.arpa - 26.191.31.176.in-addr.arpa - 2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.1.0.2.5.0.0.0.d.1.4.1.0.0.2.ip6.arpa - 216.82.26.93.in-addr.arpa diff --git a/roles/torrelay/tasks/main.yml b/roles/torrelay/tasks/main.yml index 49ff4be..65998dc 100644 --- a/roles/torrelay/tasks/main.yml +++ b/roles/torrelay/tasks/main.yml @@ -1,18 +1,10 @@ -- name: Installation du paquet centos6 Tor depuis torproject.org - yum: name=https://deb.torproject.org/torproject.org/rpm/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/tor-{{ versionupstream }}-tor.1.rh6_7.{{ ansible_architecture }}.rpm state=present - when: ansible_distribution == "CentOS" and ansible_distribution_major_version|int == 6 - -- name: Installation du paquet centos Tor depuis torproject.org - yum: name=https://deb.torproject.org/torproject.org/rpm/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/tor-{{ versionupstream }}-tor.1.rh7_1_1503.{{ ansible_architecture }}.rpm state=present - when: ansible_distribution == "CentOS" and ansible_distribution_major_version|int == 7 - - name: Installation du paquet Tor depuis le dépôt yum: name=tor state=present - when: ansible_distribution == "Fedora" and ansible_pkg_mgr == "yum" + when: ansible_pkg_mgr == "yum" - name: Installation du paquet Tor depuis le dépôt dnf: name=tor state=present - when: ansible_distribution == "Fedora" and ansible_pkg_mgr == "dnf" + when: ansible_pkg_mgr == "dnf" - name: Installation de paquets optionnels depuis le dépôt yum: name={{ item }} state=present diff --git a/roles/torrelay/templates/torrc.j2 b/roles/torrelay/templates/torrc.j2 index 26bde28..83eb3fd 100644 --- a/roles/torrelay/templates/torrc.j2 +++ b/roles/torrelay/templates/torrc.j2 @@ -30,6 +30,8 @@ HiddenServicePort 80 127.0.0.1:4433 HiddenServiceDir /var/lib/tor/hidden_service4/ HiddenServicePort 80 127.0.0.1:4434 HiddenServicePort 443 127.0.0.1:4434 +HiddenServiceDir /var/lib/tor/hidden_service5/ +HiddenServicePort 80 127.0.0.1:4433 {% endif %} diff --git a/roles/torrelay/vars/main.yml b/roles/torrelay/vars/main.yml index 2537806..28d8b91 100644 --- a/roles/torrelay/vars/main.yml +++ b/roles/torrelay/vars/main.yml @@ -1,10 +1,9 @@ orport: 9001 contactinfo: '0x83288189 Casper <fantom AT fedoraproject dot org>' dirport: 9030 -versionupstream: 0.2.7.6 fingerprints: - C9B3C1661A9577BA24C1C2C6123918921A495509 - 7350AB9ED7568F22745198359373C04AC783C37C - - BB60F5BA113A0B8B44B7B37DE3567FE561E92F78 + - 7520892E3DD133D0B0464D01A158B54B8E2A8B75 httpport: 80 httpsport: 443 |