add amsterdam node, update german node

11 files changed, 432 insertions, 18 deletions

diff --git a/files/nodes/assurancetourix/assurancetourix.crt b/files/nodes/assurancetourix/assurancetourix.crt
new file mode 100644
index 0000000..ecad491
--- /dev/null
+++ b/files/nodes/assurancetourix/assurancetourix.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
diff --git a/files/nodes/assurancetourix/assurancetourix.key b/files/nodes/assurancetourix/assurancetourix.key
new file mode 100644
index 0000000..84c5f30
--- /dev/null
+++ b/files/nodes/assurancetourix/assurancetourix.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/assurancetourix/assurancetourix_ssh.pub b/files/nodes/assurancetourix/assurancetourix_ssh.pub
new file mode 100644
index 0000000..356cacd
--- /dev/null
+++ b/files/nodes/assurancetourix/assurancetourix_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index df38cea..01f0823 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -2,6 +2,7 @@
 # This file is automatically generated by the command `leap`. You should NOT modify this file.
 # Instead, rerun `leap node init` on whatever node is causing SSH problems.
 #
+assurancetourix,assurancetourix.pano.leap.i,assurancetourix.pano.leap.se,37.218.242.147 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB
 idefix,idefix.pano.leap.i,idefix.pano.leap.se,217.197.90.63 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F
 pano,pano.pano.leap.i,pano.pano.leap.se,37.218.240.163 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXVLLAXvR/g/HAdjK2d3MlH1VO6dxyzyQQI9aAnKTaKGN8OBl86cZf6cjkba/903gF7/j5Ou0pWcU+XHslV+RIqyhE8lErRaJt7XMTdC3LFEViR27F9ZzJ+rWKlRrVyczbN1vRX+257pacAMZE47TPWT6w630TfEoErFq86K1JaXveSzYboso74RttgTDJwpqgY+wjSvcjuHFPEzNyuu1Lb6OrAkf4twklBkamBqnCi3PeGsWsIFoqnEluNotqX0ajdxKPWDEcFWoaOShbfZgkiPEEaXkq6fn++A9rjxfZ4tJ2Xaxmv1MTV+IojxqDXzO9PnznoCojuzEGwStvQ4+P
 ramix,ramix.pano.leap.i,ramix.pano.leap.se,199.119.112.92 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YrOap4uVDRWvBx1kgk582m2UKAu7yClthVLQxHLxFwYYZvEFOZxpUKvhpLubDzjTnH8+iQ3euhPdr2hYwiyzJoc+GRF7msxV3PxH7Lmo56sqgubDOMhvVPBe2F+LSCqJ71TX+JybXAic/EFviJRwW9nFNoFTezUXcbOuXQGM3GF1guSDRkf3Wt4ZutngksJaPrAx5iU/celHvbx6NhFmE5LrjAQnjtxR9KErRSES98Y3Iuis+qk2FM43tw/raj2tj71fb4UhSvHoWF7GUZ/Z5iVEDvmawAmXsIi2YhI8CCe4/e+AS2f/ouKeKPeKJArSzrd4qV/tGtoyun2GkQN3
diff --git a/hiera/assurancetourix.yaml b/hiera/assurancetourix.yaml
new file mode 100644
index 0000000..147635c
--- /dev/null
+++ b/hiera/assurancetourix.yaml
@@ -0,0 +1,275 @@
+--- 
+contacts: 
+  - kwadronaut@leap.se
+development: 
+  site_config: true
+dns: 
+  aliases: []
+  public: false
+domain: 
+  full: assurancetourix.pano.leap.se
+  full_suffix: pano.leap.se
+  internal: assurancetourix.pano.leap.i
+  internal_suffix: pano.leap.i
+  name: assurancetourix.pano.leap.i
+enabled: true
+environment: ~
+firewall: 
+  ssh: 
+    from: sysadmin
+    port: 22
+    to: "37.218.242.147"
+  stunnel: []
+hosts: 
+  assurancetourix: 
+    domain_full: assurancetourix.pano.leap.se
+    domain_internal: assurancetourix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB"
+    ip_address: "37.218.242.147"
+    port: 22
+  idefix: 
+    domain_full: idefix.pano.leap.se
+    domain_internal: idefix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F"
+    ip_address: "217.197.90.63"
+    port: 22001
+  pano: 
+    domain_full: pano.pano.leap.se
+    domain_internal: pano.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXVLLAXvR/g/HAdjK2d3MlH1VO6dxyzyQQI9aAnKTaKGN8OBl86cZf6cjkba/903gF7/j5Ou0pWcU+XHslV+RIqyhE8lErRaJt7XMTdC3LFEViR27F9ZzJ+rWKlRrVyczbN1vRX+257pacAMZE47TPWT6w630TfEoErFq86K1JaXveSzYboso74RttgTDJwpqgY+wjSvcjuHFPEzNyuu1Lb6OrAkf4twklBkamBqnCi3PeGsWsIFoqnEluNotqX0ajdxKPWDEcFWoaOShbfZgkiPEEaXkq6fn++A9rjxfZ4tJ2Xaxmv1MTV+IojxqDXzO9PnznoCojuzEGwStvQ4+P"
+    ip_address: "37.218.240.163"
+    port: 22
+  ramix: 
+    domain_full: ramix.pano.leap.se
+    domain_internal: ramix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YrOap4uVDRWvBx1kgk582m2UKAu7yClthVLQxHLxFwYYZvEFOZxpUKvhpLubDzjTnH8+iQ3euhPdr2hYwiyzJoc+GRF7msxV3PxH7Lmo56sqgubDOMhvVPBe2F+LSCqJ71TX+JybXAic/EFviJRwW9nFNoFTezUXcbOuXQGM3GF1guSDRkf3Wt4ZutngksJaPrAx5iU/celHvbx6NhFmE5LrjAQnjtxR9KErRSES98Y3Iuis+qk2FM43tw/raj2tj71fb4UhSvHoWF7GUZ/Z5iVEDvmawAmXsIi2YhI8CCe4/e+AS2f/ouKeKPeKJArSzrd4qV/tGtoyun2GkQN3"
+    ip_address: "199.119.112.92"
+    port: 22
+ip_address: "37.218.242.147"
+location: ~
+mail: 
+  smarthost: []
+mixnet: 
+  port: 28980
+  service_type: user_service
+name: assurancetourix
+platform: 
+  major_version: "0.10"
+  version: "0.10"
+service_type: internal_service
+services: 
+  - mixnet
+sources: 
+  apt: 
+    backports: "http://deb.debian.org/debian/"
+    basic: "http://deb.debian.org/debian/"
+    security: "http://security.debian.org/"
+  leap-mx: 
+    package: leap-mx
+    revision: latest
+    type: apt
+  nickserver: 
+    revision: origin/master
+    source: "https://leap.se/git/nickserver"
+    type: git
+  platform: 
+    apt: 
+      basic: "http://deb.leap.se/platform"
+      component: snapshots
+  soledad: 
+    package: soledad-server
+    revision: latest
+    type: apt
+  webapp: 
+    revision: origin/master
+    source: "https://leap.se/git/leap_web"
+    type: git
+ssh: 
+  authorized_keys: 
+    dawuud: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIO3x+WKRxugxWcuA2xuAOds5IJMMz229tdsuhjwrgrSp
+      type: ssh-ed25519
+    elijah: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCke0b9xXn6F3WhQ6i9fN78RlQA0Dmxv1jAaZ1NGDTutl3V37hzXsKYtRPtbTERZg154OSY06jfgf/v5Gzpw0HPOu95S9zgUnMdSNlkLF2+cwK4Q/uj/1fHGOFIM1Q3Kjphwv0ssabVdAwMUt6n+beDysu0bLngw4lt4/dTTmrcxEcJTS2FPFD9rSp4NwYPTL4MMpcBQ4VxGDbWyx5dgbQLnH9kVoa+mO4aT31VX25GgJES+K2Rmd+TM95iRbvGHNg8kirAlMFfddIhjtIqNi67ninfF6gc5X8p39fbbeUpUJOWOKUvmCPprnMNXlFwQ6iFpkcA/XV6qi6zr/ObN9qfy6APbTrNv8HB1bWkDBZPrsB7PLvPAdFH7yOyIHRaowPhIoQG/jlCUbJbiT6Rg+vmLOUptu+Ei+Z466ajt3G54oHjUsjoWuHD+Qn2KZnY5r3WG1xL5r/NQPA4ybS8KVLftN6Fcojy1UjrL3AkbgCgu5S6y/6H2S3Tg1sq9YxjeQKuC1vhpW4Vkwmb6UXlckIOXmVIMAd3s9Jih8actG4m2zpj6mwT+qjBNKuzOEoyBEWaXvIXDZQ+DIHc+YEP8bNtVl5qkrBTvI0C+h+uinH2dY5yDFOYVWV2j0K/Nsnj2ploYPuxMpkcO0lly6Rjl+QvcAc1VIiuz4xK9e6nt36+3Q==
+      type: ssh-rsa
+    kali: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
+      type: ssh-rsa
+    kwadronaut: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl
+      type: ssh-ed25519
+    kwadronaut2: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
+      type: ssh-rsa
+    mavroudisv: 
+      key: AAAAB3NzaC1yc2EAAAABIwAAAQEAt5AFTwW2UosjhI/ibVKrZD/465O81NEjl9gHGOWW2ykEu54kDwhq+l84Ceac7i4EqHdj4L2NhwlXqsXuafoHGEvHGt6sGg5yftlWFsvoTJIGu7/+IYP1gvMr7bu1I2sRc1TRmnmB8da8iqGaDmVpZtscS/0ByTIFfzc+z54QpCOH2djoNwW+CuG0L3GDAecIjTTmQfcW+DiXtMEPCnZmxX/7EXC4C8ofQwplEy/Keu8VOSXyh+xLzvkw8VBto9ZhcePbf3/bWknKIraoRPAqJQ6YQTTP5rEOWS/V7/MhWI/0WvGnP8WBlqwf7mcsh30bcSPpY6834MUKVnbeAp88RQ==
+      type: ssh-rsa
+    meskio: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
+      type: ssh-rsa
+    micah: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
+      type: ssh-rsa
+    monitor: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCTq6vdbppYVJqrzBm3nyZxS4QrXTx/WmLPe12y7KFRIBn+3SxiDlKzeFL01Vce8J5oJVXp61gKH2xR95Gpi5JfRr24HZs/WLA16RmhZhnFDKax2wo5aw8KtoFizxks3kA7/WNMN7/OfffGfzHcFKZ+a7gcLQ3VpvuAMPFnH+vJ9rVsIpOEu1GblfE5pC8CGPN1ZnOdQub9/imXJl9nYbgTCDX2MwWWEj4NEzzxf+6G1mwZ2gorASFV3zGsKBPNZyV4giijWofFfpTOSuPD+9wMFHn5sL0zovGQjpkip6o8+zl3FO2W8laXLDqxyp14GtlWbp9rF8QMVyvYtaxt3PV0v6GEEUbVbP0aUzwL8in2D8BdFZ/1ZcbhVe9DOAnm6dO1KPB6/Z+8Nyld2uV0JQw14+QfIRB7rvWhSabwG5UfWclp5Mh44H/eAHpiJUUODJisvrPF5TSxppBOb49zFGZFcY0wrlbvzsKmuSAOkGkyTsULadM/T5+CStoN5NLyvrBb+uVH9B8obGeCb4yNnBXAsl/w6XmN3SHLC1HXNWyhWrxT5rf4t/xRvtXWfThIiI2sYfnChGUO2TPLhZHrNjUFWbrc40r7fkyjwuyj/b+LIZLb5mfqNAUekfDKHPuR4G4OR9p+57iHWGgDPxErJEND+/YbttcFyPKvk3RCZjDm8Q==
+      type: ssh-rsa
+    varac: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
+      type: ssh-rsa
+    yawning: 
+      key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOS005NxtVAW16Q/+6cXPxluA6mrz3Ejj39poH9VCQ+H6p7EDRXQPel34ilNrKP3eA1ispGzT0lmHMc8hfy/tuqCf+Lym+PSnEh3sCwlKPGfytQYntxCPm/ZyH/z9i1g+mARNe4gwBuMbmXExQNtC/jEscPIfdCIkNFL/C+7e8TjXZboXxjdeVjuUS2JjQ0YHE22wqpwHT3lp7WMf2Ms3bTP6IbOXUdkAnu81TR29sxcgC1AdkUpnMmvTUkngblyyIxGszn7fDB0N9NgGJn4dfpSVKLDRGYqaSn3J/4El2gyBqxwgn3yWgbTTV5sOgJ9h23a+auLduQm1ycZfLiBn3LZBtmhgSCD6+BnhFIksDA7ju1tJOQKKah4UfxGXXkLnMv9+oyHrFcQO83tSN9i0WzNUxxmBI0mVjjOzoKTyxulRRQ5Pi/7Og+hWINmPMDqcsr+MSCXP6cCPTzxXY18wdLH7roLadwh/DsbUZxYti5coxSAGvR5B8NDDvE+BDEZDH72CIblOiIuOQ1cdH6NzGBJOdKD9ig7T8AWu/oaWw/8YXqV1hvTl1XslI6hqG46l+07YSLWQrnF/MXrw0KI9efRy3DBX09GSH2gQ4hxEmXu+vi3Z6tmiwxHe7EqX8b8OTIFdGnBZTIEXJmPXz0y2WMg7AGYwexUNkg6FirGLd/Q==
+      type: ssh-rsa
+  config: 
+    AllowTcpForwarding: "no"
+  mosh: 
+    enabled: false
+    ports: "60000:61000"
+  port: 22
+stunnel: 
+  clients: 
+    mixnet_nodes: 
+      idefix_28435: 
+        accept_port: 4000
+        connect: idefix.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+      pano_28435: 
+        accept_port: 4001
+        connect: pano.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+      ramix_28435: 
+        accept_port: 4002
+        connect: ramix.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+  servers: 
+    mixnet_server: 
+      accept_port: 38980
+      connect_port: 28980
+tags: []
+x509: 
+  ca_cert: |
+      -----BEGIN CERTIFICATE-----
+      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
+      8xMeFQaCYWeZDCngBA==
+      -----END CERTIFICATE-----
+  cert: |
+      -----BEGIN CERTIFICATE-----
+      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
+      -----END CERTIFICATE-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
+  key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      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
+      -----END RSA PRIVATE KEY-----
+  use: true
+  use_commercial: false
diff --git a/hiera/idefix.yaml b/hiera/idefix.yaml
index e3f5d68..40acc3c 100644
--- a/hiera/idefix.yaml
+++ b/hiera/idefix.yaml
@@ -19,12 +19,22 @@ firewall:
     from: sysadmin
     port: 22001
     to: "217.197.90.63"
-  stunnel: []
+  stunnel: 
+    - 
+      from: "37.218.242.147"
+      port: 38435
+      to: "217.197.90.63"
 hosts: 
+  assurancetourix: 
+    domain_full: assurancetourix.pano.leap.se
+    domain_internal: assurancetourix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB"
+    ip_address: "37.218.242.147"
+    port: 22
   idefix: 
     domain_full: idefix.pano.leap.se
     domain_internal: idefix.pano.leap.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F"
     ip_address: "217.197.90.63"
     port: 22001
   pano: 
@@ -44,7 +54,7 @@ location: ~
 mail: 
   smarthost: []
 mixnet: 
-  port: 28473
+  port: 20934
   service_type: user_service
 name: idefix
 platform: 
@@ -118,24 +128,29 @@ ssh:
   mosh: 
     enabled: false
     ports: "60000:61000"
-  port: 22
+  port: 22001
 stunnel: 
   clients: 
     mixnet_nodes: 
-      pano_28435: 
+      assurancetourix_28435: 
         accept_port: 4000
+        connect: assurancetourix.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+      pano_28435: 
+        accept_port: 4001
         connect: pano.pano.leap.i
         connect_port: 38435
         original_port: 28435
       ramix_28435: 
-        accept_port: 4001
+        accept_port: 4002
         connect: ramix.pano.leap.i
         connect_port: 38435
         original_port: 28435
   servers: 
     mixnet_server: 
-      accept_port: 38473
-      connect_port: 28473
+      accept_port: 30934
+      connect_port: 20934
 tags: []
 x509: 
   ca_cert: |
diff --git a/hiera/pano.yaml b/hiera/pano.yaml
index 62e29ea..43102da 100644
--- a/hiera/pano.yaml
+++ b/hiera/pano.yaml
@@ -24,13 +24,23 @@ firewall:
       from: "217.197.90.63"
       port: 38435
       to: "37.218.240.163"
+    - 
+      from: "37.218.242.147"
+      port: 38435
+      to: "37.218.240.163"
 hosts: 
+  assurancetourix: 
+    domain_full: assurancetourix.pano.leap.se
+    domain_internal: assurancetourix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB"
+    ip_address: "37.218.242.147"
+    port: 22
   idefix: 
     domain_full: idefix.pano.leap.se
     domain_internal: idefix.pano.leap.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F"
     ip_address: "217.197.90.63"
-    port: 22
+    port: 22001
   pano: 
     domain_full: pano.pano.leap.se
     domain_internal: pano.pano.leap.i
@@ -126,13 +136,18 @@ ssh:
 stunnel: 
   clients: 
     mixnet_nodes: 
-      idefix_28435: 
+      assurancetourix_28435: 
         accept_port: 4000
+        connect: assurancetourix.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+      idefix_28435: 
+        accept_port: 4001
         connect: idefix.pano.leap.i
         connect_port: 38435
         original_port: 28435
       ramix_28435: 
-        accept_port: 4001
+        accept_port: 4002
         connect: ramix.pano.leap.i
         connect_port: 38435
         original_port: 28435
diff --git a/hiera/ramix.yaml b/hiera/ramix.yaml
index 7d046b6..dc2dd9e 100644
--- a/hiera/ramix.yaml
+++ b/hiera/ramix.yaml
@@ -28,13 +28,23 @@ firewall:
       from: "37.218.240.163"
       port: 38435
       to: "199.119.112.92"
+    - 
+      from: "37.218.242.147"
+      port: 38435
+      to: "199.119.112.92"
 hosts: 
+  assurancetourix: 
+    domain_full: assurancetourix.pano.leap.se
+    domain_internal: assurancetourix.pano.leap.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD2F9j6kqjsEyJsakFOC2Jc4iGtcaWuoHvS3hv98h28WmolXsAfSL2AzTnYnd/QrdjII9yWLoBqMag4xVume7rui35Sj1hCfcjAco7jgWnP4IMDFeDZjfFSm0wXqogFDg8ksRGp/PRJpEv1SbqHQ2dZ4js4glca7deeaK0OHgfWcFZHwT0JzhkBaOJokk5AWNoNHDMHHa6JvtCYUenU1UrEQmq2ZqJvPM1ByLw4B0IkBh8/JRuXNoidEolOI0oGzboS9N86OslXeoMk08Z4q4pQQ08GZWqJfI98jCwTjcHvvY26EquNgRfmLCJCkMAd1D3qO94WwPQfpdrn5zi3r9QB"
+    ip_address: "37.218.242.147"
+    port: 22
   idefix: 
     domain_full: idefix.pano.leap.se
     domain_internal: idefix.pano.leap.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyiKOOKn2KobwF52SkXDUSB/cvbi00V8PrqFPCDELNvLI2GKAEYUuLg4kBS/e4I7DYpB6K1DnBUtAjoVvuNybDV8zVbb3MSUlwBL//7EqXeg/9ulMylBAKl4GhjmxXa5d9hMRigUeZ9e/Ocq3RJBQlHvsW4f9pX8FctWbz7GSAEzucy3QIIniSq1WgM1pK/JlQO7xPluD5e+u/djOckuwKPE76vn1y5dZbvVvIuZKKi5tSqfxY08Glbp5oyocrhim0O9h3DtkLxZeual1CXb0pXdqf0b7R8EJ9/zDkgQ4kSX5ELA2slJOgxbttsbuGozjMavPuDk4R+I9H2BohI8Yr"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzG1ghpau3eRW27BEdabnNretRSlskttmOP+ohKSQ5zBXU1xlxoXbfJ40UH9XzW4hC4U+HU4zSTTlBFu76ih6JSuwNFuubD9vYMT6w3s9jR/rtkhNRRml23lrF6Zkzm5S1wyT0Xrl0qqXpmRPqI95tiSwUDGFEEhk1zmvvIeBJtOfgqeYr1b0nyTzLFXqcd7kub7Yu2l1XjeiXBMJFq4Bhog+mXROi4LyueyI+/V5wEAQOIvFU3IhxOk2lzGLQObykUbppN28OT+vN5zJk0QmnP/Ez9xWYqVjOqJHLk7sDB7z95IfbQYwOIsVpV8hm0M3nz5yryXMmq+bps3n0mP+F"
     ip_address: "217.197.90.63"
-    port: 22
+    port: 22001
   pano: 
     domain_full: pano.pano.leap.se
     domain_internal: pano.pano.leap.i
@@ -130,13 +140,18 @@ ssh:
 stunnel: 
   clients: 
     mixnet_nodes: 
-      idefix_28435: 
+      assurancetourix_28435: 
         accept_port: 4000
+        connect: assurancetourix.pano.leap.i
+        connect_port: 38435
+        original_port: 28435
+      idefix_28435: 
+        accept_port: 4001
         connect: idefix.pano.leap.i
         connect_port: 38435
         original_port: 28435
       pano_28435: 
-        accept_port: 4001
+        accept_port: 4002
         connect: pano.pano.leap.i
         connect_port: 38435
         original_port: 28435
diff --git a/nodes/assurancetourix.json b/nodes/assurancetourix.json
new file mode 100644
index 0000000..f98cbab
--- /dev/null
+++ b/nodes/assurancetourix.json
@@ -0,0 +1,4 @@
+{
+  "ip_address": "37.218.242.147",
+  "services": "mixnet"
+}
diff --git a/nodes/idefix.json b/nodes/idefix.json
index f8155ad..4a0f1f0 100644
--- a/nodes/idefix.json
+++ b/nodes/idefix.json
@@ -1,4 +1,7 @@
 {
   "ip_address": "217.197.90.63",
-  "services": "mixnet"
+  "services": "mixnet",
+  "ssh": {
+    "port": 22001
+  }
 }
diff --git a/secrets.json b/secrets.json
index 240a3ae..85a0395 100644
--- a/secrets.json
+++ b/secrets.json
@@ -1,6 +1,7 @@
 {
   "default": {
-    "mixnet_port_idefix": 28473,
+    "mixnet_port_assurancetourix": 28980,
+    "mixnet_port_idefix": 20934,
     "mixnet_port_mixnet": 28435,
     "mixnet_port_pano": 28163,
     "mixnet_port_ramix": 27345