diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 10dcc68..7dd67c5 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -21,6 +21,7 @@ - crans - dptinfo - perso + - virtu - name: Include config files template: diff --git a/roles/ssh/templates/config.d/aurore.j2 b/roles/ssh/templates/config.d/aurore.j2 index a08b55a..478e0b0 100644 --- a/roles/ssh/templates/config.d/aurore.j2 +++ b/roles/ssh/templates/config.d/aurore.j2 @@ -1,3 +1,5 @@ -Host *.adm.auro.re +{{ ansible_header | comment }} + +Host 10.128.0.* *.adm.auro.re User ynerant ProxyJump camelot.auro.re diff --git a/roles/ssh/templates/config.d/crans.j2 b/roles/ssh/templates/config.d/crans.j2 index fe9c7c3..8f9f9e4 100644 --- a/roles/ssh/templates/config.d/crans.j2 +++ b/roles/ssh/templates/config.d/crans.j2 @@ -1,13 +1,10 @@ -Host freebox.crans.org titanic.adm.crans.org soyouz.crans.org ssh.crans.org zamok.crans.org zamok.adm.crans.org *.adh.crans.org note*.crans.org - User ynerant +{{ ansible_header | comment }} -Host odlyd.crans.org odlyd 10.231.136.4 +Host ssh.crans.org zamok.crans.org zamok.adm.crans.org *.adh.crans.org note*.crans.org User ynerant - Hostname 10.231.136.4 - ProxyJump zamok.crans.org Host 172.16.10.* 185.230.79.* *.adm.crans.org *.crans.org User _ynerant -Host 172.16.10.* *.adm.crans.org *.crans.org ynerant.fr !hodaur.crans.org !odlyd.crans.org !note*.crans.org +Host 172.16.10.* *.adm.crans.org ProxyJump hodaur.crans.org diff --git a/roles/ssh/templates/config.d/dptinfo.j2 b/roles/ssh/templates/config.d/dptinfo.j2 index 98a2255..acca9ad 100644 --- a/roles/ssh/templates/config.d/dptinfo.j2 +++ b/roles/ssh/templates/config.d/dptinfo.j2 @@ -1,3 +1,5 @@ +{{ ansible_header | comment }} + Host *.dptinfo.ens-cachan.fr !ssh.dptinfo.ens-cachan.fr User danello ProxyJump ssh.dptinfo.ens-cachan.fr diff --git a/roles/ssh/templates/config.d/perso.j2 b/roles/ssh/templates/config.d/perso.j2 index 029a5cf..3d93b2a 100644 --- a/roles/ssh/templates/config.d/perso.j2 +++ b/roles/ssh/templates/config.d/perso.j2 @@ -1,4 +1,11 @@ +{{ ansible_header | comment }} + Host main User ynerant Hostname ynerant-pc.fil.sand.auro.re ProxyJump camelot.auro.re + +Host laptop + User ynerant + Hostname ynerant-thinkpad.wifi.sand.auro.re + ProxyJump camelot.auro.re diff --git a/roles/ssh/templates/config.d/virtu.j2 b/roles/ssh/templates/config.d/virtu.j2 new file mode 100644 index 0000000..5b94dc4 --- /dev/null +++ b/roles/ssh/templates/config.d/virtu.j2 @@ -0,0 +1,5 @@ +{{ ansible_header | comment }} + +Host 172.16.42.* + User root + ProxyJump dt.adh.crans.org diff --git a/roles/ssh/templates/config.j2 b/roles/ssh/templates/config.j2 index 82782ad..0e24cf7 100644 --- a/roles/ssh/templates/config.j2 +++ b/roles/ssh/templates/config.j2 @@ -1 +1,3 @@ +{{ ansible_header | comment }} + Include ~/.ssh/config.d/*