diff options
| -rw-r--r-- | ansible.cfg | 3 | ||||
| -rw-r--r-- | hosts.ini | 5 | ||||
| -rw-r--r-- | ssh/config | 81 |
3 files changed, 6 insertions, 83 deletions
diff --git a/ansible.cfg b/ansible.cfg index 797e2d2..61275ec 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,6 +1,5 @@ [defaults] inventory = ./hosts.ini -remote_user = equinox log_path = ./log nocows=1 @@ -9,4 +8,4 @@ var_compression_level = 9 [ssh_connection] pipelining = True -ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -F ssh/config +ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -o PasswordAuthentication=no @@ -1,3 +1,8 @@ +[all:vars] +host_domain=ffgraz.net +ansible_host={{ inventory_hostname }}.{{ host_domain }} + + [baremetalservers] spektral mur diff --git a/ssh/config b/ssh/config deleted file mode 100644 index ca6e047..0000000 --- a/ssh/config +++ /dev/null @@ -1,81 +0,0 @@ -Ciphers aes256-ctr,aes128-ctr,aes256-gcm@openssh.com,aes128-gcm@openssh.com,chacha20-poly1305@openssh.com,aes256-cbc,aes128-cbc -Macs hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-ripemd160-etm@openssh.com,hmac-sha2-256,hmac-sha2-512,hmac-ripemd160 - -Host * - IdentityFile ~/.ssh/id_ff_rsa - IdentitiesOnly yes - PasswordAuthentication no - Port 22000 - -################################# -## KVM host @ spektral - -Host spektral - Hostname spektral.ffgraz.net - - -Host oldgw - Hostname oldgw.ffgraz.net - -Host gw-cc - Hostname gw-cc.ffgraz.net - -Host stats - Hostname stats.ffgraz.net - -Host www - Hostname www.ffgraz.net - -Host git - Hostname git.ffgraz.net - User git - -Host build - Hostname build.ffgraz.net - User builder - -Host build2 - Hostname server88.ffgraz.net - -Host tun - Hostname tun.ffgraz.net - -Host conftun - Hostname conftun.ffgraz.net - - -################################# -## KVM host @ mur.at - -Host mur - Hostname mur.ffgraz.net - - -Host gw-mur - Hostname gw-mur.ffgraz.net - -Host debian - Hostname debian.ffgraz.net - -Host spider - Hostname spider.ffgraz.net - - -################################# -## KVM host @ TU Bibliothek - -Host tub - Hostname tub.ffgraz.net - - -Host gw-wien - Hostname gw-wien.ffgraz.net - -Host dvb - Hostname dvb.ffgraz.net - -Host nodedb - Hostname nodedb.ffgraz.net - -Host nodedbstage - Hostname nodedb-staging.ffgraz.net |