From 63ee83dc26969ffe8303b78a74bdd0cbc8963283 Mon Sep 17 00:00:00 2001
From: Kasper Marstal <kaspermarstal@gmail.com>
Date: Mon, 24 Aug 2015 15:26:55 +0200
Subject: [PATCH] STYLE: ELASTI-1 Simplify key and cert filenames
---
Testing/Dashboard/CMakeLists.txt | 13 ++++++-------
.../{elxLogstashForwarder.crt => elxLogstash.crt} | 0
.../{elxLogstashForwarder.key => elxLogstash.key} | 0
3 files changed, 6 insertions(+), 7 deletions(-)
rename Testing/Dashboard/{elxLogstashForwarder.crt => elxLogstash.crt} (100%)
rename Testing/Dashboard/{elxLogstashForwarder.key => elxLogstash.key} (100%)
diff --git a/Testing/Dashboard/CMakeLists.txt b/Testing/Dashboard/CMakeLists.txt
index 244b8d86..20247832 100644
--- a/Testing/Dashboard/CMakeLists.txt
+++ b/Testing/Dashboard/CMakeLists.txt
@@ -8,24 +8,23 @@ mark_as_advanced( ELASTIX_DASHBOARD_BINARY_DIR )
set( ELASTIX_DASHBOARD_BINARY_DIR "${CMAKE_BINARY_DIR}/Testing/Dashboard" )
mark_as_advanced( ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE )
-set( ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE "elxLogstashForwarder.crt" )
+set( ELASTIX_DASHBOARD_LOGSTASH_CERTIFICATE "elxLogstash.crt" )
mark_as_advanced( ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY )
-set( ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY "elxLogstashForwarder.key" )
+set( ELASTIX_DASHBOARD_LOGSTASH_RSA_PRIVATE_KEY "elxLogstash.key" )
mark_as_advanced( ELASTIX_DASHBOARD_VOLUME )
-set( ELASTIX_DASHBOARD_VOLUME "${ELASTIX_DASHBOARD_BINARY_DIR}/Data" )
-
if( NOT EXISTS "${ELASTIX_DASHBOARD_VOLUME}" )
message( STATUS
- "ELASTIX_DASHBOARD_VOLUME points to the default ${CMAKE_BINARY_DIR}/Testing/Dashboard/Data path in your build directory. In production you should point this variable to a safe directory outside the build tree."
+ "ELASTIX_DASHBOARD_VOLUME points to the folder ${CMAKE_BINARY_DIR}/Testing/Dashboard/Data in your build directory. In production you should point this variable to a safe directory outside the build tree."
)
-
+
+ set( ELASTIX_DASHBOARD_VOLUME "${ELASTIX_DASHBOARD_BINARY_DIR}/Data" )
file( MAKE_DIRECTORY "${ELASTIX_DASHBOARD_VOLUME}" )
endif()
# Test/Benchmark results will be forwarded to this IP. You will probably
-# have change this in order to match docker settings on your own machine.
+# have change this in order to match docker settings on your own machine.
mark_as_advanced( ELASTIX_DASHBOARD_IP )
set( ELASTIX_DASHBOARD_IP "192.168.59.103" )
diff --git a/Testing/Dashboard/elxLogstashForwarder.crt b/Testing/Dashboard/elxLogstash.crt
similarity index 100%
rename from Testing/Dashboard/elxLogstashForwarder.crt
rename to Testing/Dashboard/elxLogstash.crt
diff --git a/Testing/Dashboard/elxLogstashForwarder.key b/Testing/Dashboard/elxLogstash.key
similarity index 100%
rename from Testing/Dashboard/elxLogstashForwarder.key
rename to Testing/Dashboard/elxLogstash.key
--
GitLab