From 128e7608df4ef9f7d869cec2ce0bcd5ddcbf3929 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Fri, 28 Aug 2015 15:39:03 +1000
Subject: [PATCH] roll back to use ca chain file
---
roles/ldapserver/tasks/main.yml | 7 ++-----
roles/ldapserver/vars/main.yml | 6 +++---
vars/main.yml | 5 -----
3 files changed, 5 insertions(+), 13 deletions(-)
delete mode 100644 vars/main.yml
diff --git a/roles/ldapserver/tasks/main.yml b/roles/ldapserver/tasks/main.yml
index 6c5539aa..53824644 100644
--- a/roles/ldapserver/tasks/main.yml
+++ b/roles/ldapserver/tasks/main.yml
@@ -61,10 +61,6 @@
template: src=manager_ldif3.j2 dest=/tmp/manager3.ldif mode=600
sudo: true
-- name: make ca dir
- file: path={{ ldapCAChainDest | dirname }} state=directory owner={{ ldapuser }} group={{ ldapgroup }}
- sudo: true
-
- name: make ldap certs dir
file: path={{ ldapCertDest | dirname }} state=directory owner={{ ldapuser }} group={{ ldapgroup }}
sudo: true
@@ -77,10 +73,11 @@
copy: src="files/{{ ldapCert }}" dest="{{ ldapCertDest }}"
sudo: true
-- name: copy cacert
+- name: copy ca cert
copy: src="files/{{ ldapCAChain }}" dest="{{ ldapCAChainDest }}"
sudo: true
+
- name: copy key
copy: src="files/{{ ldapKey }}" dest="{{ ldapKeyDest }}" mode=600 owner={{ ldapuser }} group={{ ldapgroup }}
sudo: true
diff --git a/roles/ldapserver/vars/main.yml b/roles/ldapserver/vars/main.yml
index 23bde66d..d0613910 100644
--- a/roles/ldapserver/vars/main.yml
+++ b/roles/ldapserver/vars/main.yml
@@ -1,4 +1,4 @@
---
-ldapCertDest: "{{ ldapDir }}/ssl/certs/hpcldap0.erc.monash.edu.au.cert.pem"
-ldapKeyDest: "{{ ldapDir }}/ssl/private/hpcldao0.erc.monash.edu.au.key.pem"
-ldapCAChainDest: "{{ ldapDir }}/ssl/certs/MeRC_HPC_CaChain.cert.pem"
+ldapCertDest: "{{ ldapDir }}/ssl/certs/ldapcert.pem"
+ldapKeyDest: "{{ ldapDir }}/ssl/private/ldapkey.pem"
+ldapCAChainDest: "{{ ldapDir }}/ssl/certs/cacert.pem
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 8aae17d4..00000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-ldapKey: "hpcldap0.erc.monash.edu.au.key.pem"
-ldapCert: "hpcldap0.erc.monash.edu.au.cert.pem"
-ldapCAChain: "MeRC_HPC_CA_Chain.cert.pem"
-
--
GitLab