From cc509627df565e16703849825388281c5132b484 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Tue, 9 Jun 2015 12:52:52 +1000
Subject: [PATCH] Apply for openssh ca on M2CVL
---
roles/jasons_ssh_ca/handlers/main.yml | 7 ++++---
roles/jasons_ssh_ca/tasks/main.yml | 3 +--
roles/openssh/tasks/installSsh.yml | 1 +
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/roles/jasons_ssh_ca/handlers/main.yml b/roles/jasons_ssh_ca/handlers/main.yml
index 875ea0a..af2e04a 100644
--- a/roles/jasons_ssh_ca/handlers/main.yml
+++ b/roles/jasons_ssh_ca/handlers/main.yml
@@ -1,5 +1,6 @@
---
-- name: restart ssh debian
- service: name=ssh state=restarted
+- include_vars: "roles/openssh/vars/{{ ansible_os_family }}_{{ ansible_architecture }}.yml"
+
+- name: restart ssh
+ service: name={{ sshd_name }} state=restarted
sudo: true
- when: ansible_os_family == "Debian"
diff --git a/roles/jasons_ssh_ca/tasks/main.yml b/roles/jasons_ssh_ca/tasks/main.yml
index 4be9b14..1823b18 100644
--- a/roles/jasons_ssh_ca/tasks/main.yml
+++ b/roles/jasons_ssh_ca/tasks/main.yml
@@ -10,5 +10,4 @@
line: TrustedUserCAKeys /etc/ssh/server_ca.pub
state: present
sudo: true
- notify: restart ssh debian
- when: ansible_os_family == "Debian"
+ notify: restart ssh
diff --git a/roles/openssh/tasks/installSsh.yml b/roles/openssh/tasks/installSsh.yml
index cc73e0a..3dd1388 100644
--- a/roles/openssh/tasks/installSsh.yml
+++ b/roles/openssh/tasks/installSsh.yml
@@ -19,6 +19,7 @@
shell: tar zxf /tmp/openssh-{{ ssh_version }}.tar.gz
args:
chdir: /tmp
+ creates: /tmp/openssh-{{ ssh_version }}/ssh
- name: build ssh
shell: ./configure --prefix={{ ssh_dir }} --with-ipv4-default --with-md5-passwords --with-pam && make
--
GitLab