vault crypt, ssh max and 2nd host

3 files changed, 43 insertions, 30 deletions

diff --git a/.ansible_vault_pw.gpg b/.ansible_vault_pw.gpg
index 528c805..d96334d 100644
--- a/.ansible_vault_pw.gpg
+++ b/.ansible_vault_pw.gpg
@@ -1,30 +1,41 @@
 -----BEGIN PGP MESSAGE-----
 
-hF4DpfWzu9aeW0ISAQdA9oEXYzY16y3F7Y7cjv+dMJ0bD+4k1onc86S7rncaEngw
-8xyTlHpFfSeQHK78LlsLY6KBf6NpZHXNyFCZy6NidINSxe3vUq/E4TwHvyYkRrYF
-hQIMA4yO+U9cs73UAQ/8DT0KLuZ2bhyJyzSGcb/s5O6qyqQypozeLvRvtbResnyL
-YWhG7/yMjmzhGCHW1daj9W4gcTQFYq0Mh+x5SAcDFKzJ8XeN4hQGR+AXhucxpyJn
-e4T0RHNyzztGcEWvFNazq5uBv2OsoeZtnwOOd1C3gZvKkfD2E5eJa0DaLSbwUBw7
-/4fTlDwiJTP5suk2D1W2m65cY+gze2uMokfEgeP7YquSnBQZKWgv/IZ9fnvar6Pm
-+YCGMmuFtIBu1kyGKR3akef372JspJJrMHlG9Z9zvQRgLHvXuQ+jzDXjB2iWP0xX
-wmF3WBzGReqIYABmmpzx78+U+azTR25ZcaAtzKwxUmH27vQSeUx4xKozyZ611TSk
-T0WwT7CJEDB2M9m8js6oxbQjFIp8XJQ9h/5qXfJoZzRhmwviH05YZ9RpPFWkPfgS
-vj6tadJdFZPtJ2wC3fv+VIydRbKxk0pIGE5v3ZVqC5HwDYLj4tyekosa71FK+N+w
-U7NNpz+j8UBZ5cTogkJCOGGkEp10o1obpOs6qe71M9eIVxOjx+NO1pJK/4l1j5vA
-ha770oK+9jJB/V0r/g4qZ2MhecbhrUgngp7V9QueqMoBGVFSR0NApY1X1oAvRwA5
-B/W3h2kFDED6TPCy3uWds3PNGKK1nwvftONtcAQreWYzBlhmk3GRlj54oVL77JCF
-AgwDKS9PgWe1HjoBD/0WMlgM9ix7E/GiKjzP8pu7QaTr8fQ9BkmODwGsH6AjlW6o
-sNsE+68+uc/Yl0GWkdWf0qGuk8Nh8/B5sFdmFknsCidpvSorwonin7rLUunNypmu
-qpOQwuBiZIGJ6YV545Mv9pNw4BEL/tFWc2AKslCiogUiMcjRlBTZgWMQ7Rf3LhFW
-HcEa6h/o7m5kfbSk4dIeb+MT/VG5HCOnabADSLRUqULMU9AHJNB5IktoTQLrHgCs
-V3SdaqF3zz3iAu+3SX4qey7+BKQQ4EdeZCaJ81/y7Onm2/Zj09CADd4qKpQW7+lq
-QkA0C55Vpiyid/BNgcQwIS1FQsS/F/fWTzdPLXbda7/dB6ZEf+YkDE0s8DMpJayp
-myMGfh9CWp/S9nmo+6BSLDEqJ0aKJNggYlRGX3/5uay07SAI2oFSU7kFEv0s9ND2
-Vf2rGxs8CqnYyTAB2W98bP2LO1W9dIQCV8UdnZc6Id5ufXgYI2UANkZgruLrN8Oo
-5kBVAQvmS5qXdjchyAuq+jSVGL//mqOmNvnOjBj6uLqwzNWBPUuAMb/wBc5uI2+7
-RnkzVAIEsVjEwk2waUKyPeK2Adm4GWqUcd2+Z7T52Z2xIbjTgQUn9TK/Mj83n/F2
-iTaOGob/WFEe50FbVtXgMTa6jTCtGqrAMTdmZvYF0uI/647X6U5vGXZwM0dhINJV
-AbfA4AACXW3xjF4CyIXX7TCaRW7cp3pAgaMbIVafQQvYnRz9/TOi70OJIgXyoLKv
-Hq6NMlwAuXj7dv7XFMtoeEPJm/yA/RkVU7d4aSxqnkIEP+dLyg==
-=lLtL
+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
+=vu04
 -----END PGP MESSAGE-----
diff --git a/group_vars/all/config.yml b/group_vars/all/config.yml
index 2864b22..0ff78ee 100644
--- a/group_vars/all/config.yml
+++ b/group_vars/all/config.yml
@@ -31,3 +31,4 @@ admins:
       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0aQ6m/foqJlc4xSb585ZvoJWiNlkn15Jm4445yiZky"
       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl"
       - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxNQ1ftUTzhiFklddB7r8p0F4LLkIwqFdsWpjAhIF/T"
+      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA19eteHP+bMQZIKx/aNXDat8ZAIvc+1UGE2SbAcH6jd max-b@riseup.net"
diff --git a/hosts.yml b/hosts.yml
index 48f43c0..9eb0b1e 100644
--- a/hosts.yml
+++ b/hosts.yml
@@ -23,6 +23,7 @@ hosts:
     groups: [openvpn]
     ips:
       - 37.218.241.208
+      - 37.218.241.141
     # The 'ip_vpn0' is for the internal network overlay only. Assign an unique
     # value for each host
     #    ip_vpn0: 172.16.1.3
@@ -35,13 +36,13 @@ hosts:
   cod:
     ansible_host: 37.218.245.94
     groups: [openvpn]
-    location: Amsterdam
     ips:
       - 37.218.245.94
+      - 37.218.245.4
     ip_vpn0: 172.16.1.4
     egress_ip: 37.218.245.4
-    OBFSPORT: '80'
-    transport: obfs4      
+    location: Amsterdam
+    ip_vpn0: 172.16.1.4
        
 #  gateway2:
 #    ansible_host: gateway2.float.bitmask.net