gateway: Manage service state based on openvpn_server_name

Also updated list of secrets we maintain

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/gateway/README.rst b/roles/gateway/README.rst
index 2a9821b166cef42360d6f21f81f8a92fa000d7b7..5bb66c107008d2822541e99b45b07035e4601ce5 100644 (file)
--- a/roles/gateway/README.rst
+++ b/roles/gateway/README.rst
@@ -23,11 +23,15 @@ A list of packages to install that is specific to the role.  The list is defined
 
     packages: []
 
+A unique name to give to your OpenVPN service.  This name is used to organize configuration files and start/stop the service.  Defined in the secrets repo::
+
+    openvpn_server_name: []
+
 The directory in which the OpenVPN server CA, keys, certs, and user file should be saved.  Defined in the secrets repo::
 
     openvpn_data_dir: []
 
-Contains paths, file permission (modes), and data to store and maintain OpenVPN CA, cert, key, and main server config.  Consult your server.conf on what you should define here.  For reference, we have dh1024.pem, server.crt, server.key, and server.conf defined.  Defined in the secrets repo::
+Contains paths, file permission (modes), and data to store and maintain OpenVPN CA, cert, key, and main server config.  Consult your server.conf on what you should define here.  For reference, we have dh1024.pem, server.crt, server.key, tlsauth, and server.conf defined.  Defined in the secrets repo::
 
     gateway_secrets: []
 

diff --git a/roles/gateway/tasks/main.yml b/roles/gateway/tasks/main.yml
index 864f8ce46ef694a4eb9611af3b3f18ceec46135e..734c199ff02b759b31cc78473d732f618a110792 100644 (file)
--- a/roles/gateway/tasks/main.yml
+++ b/roles/gateway/tasks/main.yml
@@ -31,6 +31,6 @@
 
 - name: Make sure OpenVPN service is running and enabled
   service:
-    name: openvpn@server
+    name: "openvpn@{{ openvpn_server_name }}"
     state: started
     enabled: yes