From ebc146f6215327168580ec1be484581d8d4f0a15 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Mon, 8 Dec 2014 02:22:49 +0000
Subject: [PATCH] Fixed variables
---
roles/OpenVPN-Server/tasks/copyCerts.yml | 23 -----------------------
roles/OpenVPN-Server/vars/main.yml | 7 -------
roles/nfs-client/defaults/main.yml | 4 ++--
3 files changed, 2 insertions(+), 32 deletions(-)
delete mode 100644 roles/OpenVPN-Server/tasks/copyCerts.yml
delete mode 100644 roles/OpenVPN-Server/vars/main.yml
diff --git a/roles/OpenVPN-Server/tasks/copyCerts.yml b/roles/OpenVPN-Server/tasks/copyCerts.yml
deleted file mode 100644
index fe13384..0000000
--- a/roles/OpenVPN-Server/tasks/copyCerts.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: "Copying CA and server certificate"
- shell: "cp -pvf /etc/easy-rsa/2.0/keys/ca.crt /etc/openvpn/; cp -pvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.crt /etc/openvpn/; cp -pvf /etc/easy-rsa/2.0/keys/{{ inventory_hostname }}.key /etc/openvpn/"
- args:
- chdir: /etc/openvpn/
- creates: ca.crt
-- name: "Create symlink for Diffie Hellman"
- file: "src=/etc/easy-rsa/2.0/keys/dh512.pem dest=/etc/openvpn/dh512.pem state=link"
-- name: "Copying server.conf to the OpenVPN server"
- template: src={{ item }} dest=/etc/openvpn/server.conf
- with_first_found:
- - files:
- - server.conf.j2
- - userConfig
- - defaultConfig
- paths:
- - ../templates/
- - ../files/
- notify: restart openvpn
-
-- name: "Start OpenVPN"
- service: name=openvpn state=started
- sudo: true
diff --git a/roles/OpenVPN-Server/vars/main.yml b/roles/OpenVPN-Server/vars/main.yml
deleted file mode 100644
index 0118883..0000000
--- a/roles/OpenVPN-Server/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-x509_csr_args: "--server"
-x509_cacert_file: "/etc/ssl/certs/ca.crt"
-x509_key_file: "/etc/openvpn/private/server.key"
-x509_cert_file: "/etc/openvpn/certs/server.crt"
-x509_common_name: "{{ ansible_fqdn }}_OpenVPN_Server"
-dhparms_file: "/etc/openvpn/private/dh.pem"
diff --git a/roles/nfs-client/defaults/main.yml b/roles/nfs-client/defaults/main.yml
index 01f4e67..d201130 100644
--- a/roles/nfs-client/defaults/main.yml
+++ b/roles/nfs-client/defaults/main.yml
@@ -1,6 +1,6 @@
---
-nfsClientSrcDir: ['/mnt']
-nfsClientDestDir: ['/mnt/test-nfs']
+nfsClientSrcDir: '/mnt'
+nfsClientDestDir: '/mnt/test-nfs'
nfs_server: 'nfsserver.edu'
nfs_type: 'nfs'
nfs_options: 'vers=3,noatime,rsize=16384,wsize=16384,hard,intr,tcp,nolock'
--
GitLab