From c349f866b1fba99a977de637d261a032f830c81a Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Thu, 21 Jun 2012 13:12:57 +0000 Subject: [PATCH] 2012-06-21 Juan Manuel Ramon Vigo * unix/AIX/pandora_agent.conf unix/Linux/pandora_agent.conf unix/HP-UX/pandora_agent.conf shellscript/mac_osx/pandora_agent.conf unix/NT4/pandora_agent.conf unix/SunOS/pandora_agent.conf unix/FreeBSD/pandora_agent.conf shellscript/linux/pandora_agent.conf shellscript/openWRT/pandora_agent.conf: Changed enconding token to UTF-8 in all Unix agents configuration files. * unix/pandora_agent shellscript/linux/pandora_agent shellscript/mac_osx/pandora_agent shellscript/openWRT/pandora_agent: Changed default enconding to UTF-8 in Unix agents. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/ChangeLog | 21 +++++++++++++++++++ .../shellscript/linux/pandora_agent | 2 +- .../shellscript/linux/pandora_agent.conf | 2 +- .../shellscript/mac_osx/pandora_agent | 2 +- .../shellscript/mac_osx/pandora_agent.conf | 2 +- .../shellscript/openWRT/pandora_agent | 2 +- .../shellscript/openWRT/pandora_agent.conf | 2 +- pandora_agents/unix/AIX/pandora_agent.conf | 2 +- .../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/NT4/pandora_agent.conf | 2 +- pandora_agents/unix/SunOS/pandora_agent.conf | 2 +- pandora_agents/unix/pandora_agent | 2 +- 14 files changed, 34 insertions(+), 13 deletions(-) diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog index 24c180cfd0..92264d034f 100644 --- a/pandora_agents/ChangeLog +++ b/pandora_agents/ChangeLog @@ -1,3 +1,24 @@ +2012-06-21 Juan Manuel Ramon Vigo + + * unix/AIX/pandora_agent.conf + unix/Linux/pandora_agent.conf + unix/HP-UX/pandora_agent.conf + shellscript/mac_osx/pandora_agent.conf + unix/NT4/pandora_agent.conf + unix/SunOS/pandora_agent.conf + unix/FreeBSD/pandora_agent.conf + shellscript/linux/pandora_agent.conf + shellscript/openWRT/pandora_agent.conf: Changed enconding token to + UTF-8 in all Unix agents configuration files. + + * unix/pandora_agent + shellscript/linux/pandora_agent + shellscript/mac_osx/pandora_agent + shellscript/openWRT/pandora_agent: Changed default enconding to + UTF-8 in Unix agents. + + Merged from branches. + 2012-05-23 Ramon Novoa * pc: Added to repository. Generic PC agent for Unix/Win32 (still in diff --git a/pandora_agents/shellscript/linux/pandora_agent b/pandora_agents/shellscript/linux/pandora_agent index 25aa28920a..738a06bd5e 100755 --- a/pandora_agents/shellscript/linux/pandora_agent +++ b/pandora_agents/shellscript/linux/pandora_agent @@ -454,7 +454,7 @@ TRANSFER_MODE=ssh CRON_MODE=0 if [ -z "`echo $LANG | grep '\.'`" ] then - ENCODING="iso-8859-1" + ENCODING="UTF-8" else ENCODING=`echo $LANG | cut -f 2 -d "."` fi diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf index 59995263b1..7427cb12ec 100755 --- a/pandora_agents/shellscript/linux/pandora_agent.conf +++ b/pandora_agents/shellscript/linux/pandora_agent.conf @@ -34,7 +34,7 @@ debug 0 # autotime 1 # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent b/pandora_agents/shellscript/mac_osx/pandora_agent index b3ca2278d4..07c3ef625a 100755 --- a/pandora_agents/shellscript/mac_osx/pandora_agent +++ b/pandora_agents/shellscript/mac_osx/pandora_agent @@ -454,7 +454,7 @@ TRANSFER_MODE=ssh CRON_MODE=0 if [ -z "`echo $LANG | grep '\.'`" ] then - ENCODING="iso-8859-1" + ENCODING="UTF-8" else ENCODING=`echo $LANG | cut -f 2 -d "."` fi diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf index 92a654aa14..5030ddbb0f 100755 --- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf +++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf @@ -34,7 +34,7 @@ debug 0 # autotime 1 # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/shellscript/openWRT/pandora_agent b/pandora_agents/shellscript/openWRT/pandora_agent index bca0791cdb..196e03f6fd 100755 --- a/pandora_agents/shellscript/openWRT/pandora_agent +++ b/pandora_agents/shellscript/openWRT/pandora_agent @@ -45,7 +45,7 @@ TRANSFER_MODE=tentacle SERVER_PWD=pandora123 if [ -z "`echo $LANG | grep '\.'`" ] then - ENCODING="iso-8859-1" + ENCODING="UTF-8" else ENCODING=`echo $LANG | cut -f 2 -d "."` fi diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf index 5d73e6c0b9..a4f7ab7414 100755 --- a/pandora_agents/shellscript/openWRT/pandora_agent.conf +++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf @@ -22,7 +22,7 @@ debug 0 agent_name arduinoasus # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # 41121 by default. server_port 41121 diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf index bf2d52c5bb..769c3ed7af 100755 --- a/pandora_agents/unix/AIX/pandora_agent.conf +++ b/pandora_agents/unix/AIX/pandora_agent.conf @@ -47,7 +47,7 @@ debug 0 #altitude 0 # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf index 7f0153e1fd..b24ad6db94 100755 --- a/pandora_agents/unix/FreeBSD/pandora_agent.conf +++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf @@ -55,7 +55,7 @@ debug 0 #position_description Madrid, centro # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf index a72ad4f37d..019036a29c 100755 --- a/pandora_agents/unix/HP-UX/pandora_agent.conf +++ b/pandora_agents/unix/HP-UX/pandora_agent.conf @@ -49,7 +49,7 @@ debug 0 #altitude 0 # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf index 3ca601aec8..28bb1a9fea 100755 --- a/pandora_agents/unix/Linux/pandora_agent.conf +++ b/pandora_agents/unix/Linux/pandora_agent.conf @@ -77,7 +77,7 @@ udp_server_auth_address 0.0.0.0 #position_description Madrid, centro # By default agent try to take default encoding defined in host. -#encoding iso-8859-15 +#encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf index 7462e30349..a8f8f84964 100644 --- a/pandora_agents/unix/NT4/pandora_agent.conf +++ b/pandora_agents/unix/NT4/pandora_agent.conf @@ -64,7 +64,7 @@ udp_server_auth_address 0.0.0.0 #position_description Madrid, centro # By default agent try to take default encoding defined in host. -#encoding iso-8859-15 +#encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf index d6eab4c54b..e0b6339011 100755 --- a/pandora_agents/unix/SunOS/pandora_agent.conf +++ b/pandora_agents/unix/SunOS/pandora_agent.conf @@ -49,7 +49,7 @@ debug 0 #altitude 0 # By default agent try to take default encoding defined in host. -# encoding iso-8859-15 +# encoding UTF-8 # Listening TCP port for remote server. By default is 41121 (for tentacle) # if you want to use SSH use 22, and FTP uses 21. diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 19e8f3208b..81059021f6 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -137,7 +137,7 @@ my %Conf = ( 'agent_name' => hostname (), 'description' => '', 'group' => '', - 'encoding' => 'ISO-8859-1', + 'encoding' => 'UTF-8', 'server_port' => 41121, 'transfer_mode' => 'tentacle', 'server_pwd' => '',