summaryrefslogtreecommitdiff
path: root/ansible/shell-shell.vm.liw.fi.yml
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/shell-shell.vm.liw.fi.yml')
-rw-r--r--ansible/shell-shell.vm.liw.fi.yml14
1 files changed, 9 insertions, 5 deletions
diff --git a/ansible/shell-shell.vm.liw.fi.yml b/ansible/shell-shell.vm.liw.fi.yml
index 9cd9738..ca1e32c 100644
--- a/ansible/shell-shell.vm.liw.fi.yml
+++ b/ansible/shell-shell.vm.liw.fi.yml
@@ -1,4 +1,4 @@
-- hosts: shell
+- hosts: shell-shell.vm.liw.fi
remote_user: root
roles:
- role: sane_debian_system
@@ -32,14 +32,18 @@
comment: Soile Mottisenkangas
mailname: pieni.net
- smarthost: mail.pepperfish.net
+ smarthost: mail.infrafish.uk
smarthost_port: 587
- smarthost_user: pieni-fwd@ppfm.net
- smarthost_pass_name: pieni.net/smarthost_pass
+ smarthost_user: liw@login.liw.fi
+ smarthost_pass_name: pieni.net/smarthost_pass_intrafish
mail_hostname: pieni.net
+ # We must define the sshd variables here. The defaults from the
+ # "all" group assume sshca knows the host by the
+ # sane_debian_system_hostname name, which isn't true for this
+ # host.
sshd_version: 1
sshd_host_key: "{{ lookup('pipe', 'sshca host private-key shell-shell.vm.liw.fi') }}"
- sshd_host_cert: "{{ lookup('pipe', 'sshca host certify liw.fi/ca/host/v5 shell-shell.vm.liw.fi') }}"
+ sshd_host_cert: "{{ lookup('pipe', 'sshca host certify --ca liw.fi/ca/host/v5 shell-shell.vm.liw.fi') }}"
sshd_user_ca_pub: "{{ lookup('pipe', 'sshca ca public-key liw.fi/ca/user/v5') }}"