main: Remove COROSYNC_TOTEM_AUTHKEY_FILE

Remove another environment variable (reasons similar to removal of
COROSYNC_MAIN_CONFIG_FILE).

Also properly document both totem.keyfile and totem.key.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>

exec/totemconfig.c

@@ -2014,13 +2014,9 @@ int totem_config_keyread (
 
 	/* In desperation we read the default filename */
 	if (!got_key) {
-		const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
-		if (!filename)
-			filename = COROSYSCONFDIR "/authkey";
-		res = read_keyfile(filename, totem_config, error_string);
+		res = read_keyfile(COROSYSCONFDIR "/authkey", totem_config, error_string);
 		if (res)
 			goto key_error;
-
 	}
 
 	return (0);

man/corosync.conf.5

@@ -32,7 +32,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH COROSYNC_CONF 5 2018-11-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
+.TH COROSYNC_CONF 5 2018-11-13 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 corosync.conf - corosync executive configuration file
 
@@ -224,15 +224,29 @@ transmission is only supported for the knet transport.
 
 The default is none.
 
+.TP
+keyfile
+This specifies the fully qualified path to the shared key used to
+authenticate and encrypt data used within the Totem protocol.
+
+The default is /etc/corosync/authkey.
+
+.TP
+key
+Shared key stored in configuration instead of authkey file. This option
+has lower precedence than keyfile option so it's
+used only when keyfile is not specified.
+Using this option is not recommended for security reasons.
+
 .TP
 link_mode
 This specifies the Kronosnet mode, which may be passive, active, or
-rr (round-robin). 
+rr (round-robin).
 .B passive:
 the active link with the lowest priority will be used. If one or more 
 links share the same priority the one with the lowest link ID will
 be used.
-.B active: 
+.B active:
 All active links will be used simultaneously to send traffic.
 link priority is ignored.
 .B rr:

man/corosync_overview.7

@@ -32,7 +32,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH COROSYNC_OVERVIEW 7 2018-09-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
+.TH COROSYNC_OVERVIEW 7 2018-11-13 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 corosync_overview \- Corosync overview
 .SH OVERVIEW
@@ -143,17 +143,6 @@ advantage to the end user is excellent performance characteristics and a proven
 protocol with excellent reliability.  This protocol connects the processors
 in a configuration together so they may communicate.
 
-.SH ENVIRONMENT VARIABLES
-The corosync executive process uses four environment variables during startup.
-If these environment variables are not set, defaults will be used.
-
-.TP
-COROSYNC_TOTEM_AUTHKEY_FILE
-This specifies the fully qualified path to the shared key used to
-authenticate and encrypt data used within the Totem protocol.
-
-The default is /etc/corosync/authkey.
-
 .SH SECURITY
 The corosync executive optionally encrypts and signs all messages sent
 over the network. For more details see