From 0c0db3a534994eb36a507c40a8b230f6218f2e7a Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 28 Oct 2015 14:03:24 +0100 Subject: [PATCH] Modified server_opts help in Unix agents and added server_opts token in windows Conflicts: pandora_agents/unix/FreeBSD/pandora_agent.conf pandora_agents/unix/NetBSD/pandora_agent.conf pandora_agents/unix/SunOS/pandora_agent.conf --- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- pandora_agents/unix/Darwin/pandora_agent.conf | 2 +- pandora_agents/unix/FreeBSD/pandora_agent.conf | 2 +- pandora_agents/unix/HP-UX/pandora_agent.conf | 2 +- pandora_agents/unix/Linux/pandora_agent.conf | 2 +- pandora_agents/unix/NetBSD/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/win32/bin/pandora_agent.conf | 3 +++ 8 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index 2cde1470a3..6106490191 100644 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -62,7 +62,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). # server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). # server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf index 9a380c11a5..4b32fdda47 100644 --- a/pandora_agents/unix/Darwin/pandora_agent.conf +++ b/pandora_agents/unix/Darwin/pandora_agent.conf @@ -92,7 +92,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). #server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). #server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index 13e817cc99..9fe06fbbf0 100644 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -74,7 +74,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). # server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). # server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index 6fcc220c82..a03c791b31 100644 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -64,7 +64,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). # server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). # server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 09130e1f38..20b3a5fd80 100644 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -100,7 +100,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). #server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). #server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf index 1839e24ef4..355bf058f7 100644 --- a/pandora_agents/unix/NetBSD/pandora_agent.conf +++ b/pandora_agents/unix/NetBSD/pandora_agent.conf @@ -70,7 +70,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). # server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). # server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index bd1693bd5a..02f8a52e6c 100644 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -64,7 +64,7 @@ transfer_mode tentacle # Set to yes/no to enable/disable OpenSSL support for Tentacle (disabled by default). # server_ssl no -# Extra options for the Tentacle client (for example, server_opts "-v -r 5"). +# Extra options for the Tentacle client (for example: server_opts -v -r 5). # server_opts # delayed_startup defines number of seconds before start execution diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf index 39f4a22cd7..7092815947 100644 --- a/pandora_agents/win32/bin/pandora_agent.conf +++ b/pandora_agents/win32/bin/pandora_agent.conf @@ -65,6 +65,9 @@ server_port 41121 # In case of using FTP or tentacle with password. User is always "pandora" #server_pwd pandora +# Extra options for the Tentacle client (for example: server_opts -v -r 5). +#server_opts + # If set to 1 disables log writing into pandora_agent.log #disable_logfile 1