aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-08-11 15:03:03 +0000
committerMichael Scherer <misc@mageia.org>2011-08-11 15:03:03 +0000
commit2f68394517a0969909a9ed40194fa691d85edf00 (patch)
tree064d9b0335a01c728c8d7493df1f02234c7df31f
parent2c06a1be47af4588ae7caa6ffb7e3f27aba84b4d (diff)
downloadpuppet-2f68394517a0969909a9ed40194fa691d85edf00.tar
puppet-2f68394517a0969909a9ed40194fa691d85edf00.tar.gz
puppet-2f68394517a0969909a9ed40194fa691d85edf00.tar.bz2
puppet-2f68394517a0969909a9ed40194fa691d85edf00.tar.xz
puppet-2f68394517a0969909a9ed40194fa691d85edf00.zip
use real name of the server, in order to attempt solve the problem
of having xymon complaining that no report have been sent by alamut for bbgen
-rw-r--r--modules/xymon/templates/bb-hosts2
-rw-r--r--modules/xymon/templates/hobbitserver.cfg2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index b6aff152..4ac5cc0b 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -34,7 +34,7 @@ page visible Visible Services
page servers Servers
group-compress Marseille
-212.85.158.146 alamut.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %>
+212.85.158.146 alamut.<%= domain %> # testip bbd dns smtp ssh
212.85.158.147 valstar.<%= domain %> # testip ssh rsync svn git ldapssl ldap
212.85.158.148 ecosse.<%= domain %> # testip ssh
212.85.158.149 jonund.<%= domain %> # testip ssh
diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg
index 45e7b866..60dd1a75 100644
--- a/modules/xymon/templates/hobbitserver.cfg
+++ b/modules/xymon/templates/hobbitserver.cfg
@@ -5,7 +5,7 @@ BBSERVERLOGS="/var/log/xymon" # Directory for server logs. The hobbit user must
HOBBITCLIENTHOME="<%= lib_dir %>/xymon/client" # BBHOME directory for the client
-BBSERVERHOSTNAME="xymon.<%= domain %>" # The hostname of your server
+BBSERVERHOSTNAME="alamut.<%= domain %>" # The hostname of your server
BBSERVERIP="<%= ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 .
BBSERVEROS="linux" # The operating system of your server. linux,freebsd,solaris,hpux,aix,osf
tg.po
index 441e12ae2..dd568c1e5 100644
--- a/perl-install/share/po/tg.po
+++ b/perl-install/share/po/tg.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
"POT-Creation-Date: 2016-12-12 23:00+0100\n"
-"PO-Revision-Date: 2017-02-16 07:13+0000\n"
+"PO-Revision-Date: 2017-02-16 07:32+0000\n"
"Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
"Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
"tg/)\n"
@@ -1243,7 +1243,7 @@ msgstr "Шуд"
#: scanner.pm:119 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
-msgstr "Хатогӣ"
+msgstr "Хато"
#: diskdrake/dav.pm:86
#, c-format
@@ -2320,8 +2320,8 @@ msgid ""
"An error occurred - no valid devices were found on which to create new "
"filesystems. Please check your hardware for the cause of this problem"
msgstr ""
-"Хатогӣ рух дод - ягон дастгоҳи аслие, барои офаридани файлсистеми нав ёфт "
-"нашуд. Барои фаҳмидани ин муаммо сахтафзорро санҷида бинед"
+"Хато ба вуҷуд омад - ягон дастгоҳи аслие, барои офаридани файлсистеми нав "
+"ёфт нашуд. Барои фаҳмидани ин муаммо сахтафзорро санҷида бинед"
#: fs/any.pm:77 fs/partitioning_wizard.pm:77
#, c-format