From 778241fc580f2f1f8aed17dd21d9ea39f868ed02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Thu, 2 Feb 2017 13:15:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20jabber.yml=20=D1=84=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=BB=D0=B0=20=D0=B5=D1=81=D0=BB=D0=B8=20=D1=83=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D0=BD=D0=BE=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D1=85=D0=BE=D1=81=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 profile/jabber/etc/jabber/ejabberd.yml | 2 +-
 pym/cl_fill_server.py                  | 7 +++++++
 pym/cl_vars_server.py                  | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/profile/jabber/etc/jabber/ejabberd.yml b/profile/jabber/etc/jabber/ejabberd.yml
index 599020d..5d0388b 100644
--- a/profile/jabber/etc/jabber/ejabberd.yml
+++ b/profile/jabber/etc/jabber/ejabberd.yml
@@ -3,7 +3,7 @@ loglevel: 1
 disable_sasl_mechanisms: ["X-OAUTH2"]
 hosts: 
   - "localhost"
-  - #-sr_jabber_hosts_pass-#
+#-sr_jabber_hosts_yml-#
 listen: 
   - 
     port: #-sr_jabber_port-#
diff --git a/pym/cl_fill_server.py b/pym/cl_fill_server.py
index 194fe90..04c303e 100644
--- a/pym/cl_fill_server.py
+++ b/pym/cl_fill_server.py
@@ -546,6 +546,13 @@ class fillVars(object, cl_base.glob_attr):
             return ", ".join(map(lambda x: '"'+x+'"', jabberHosts.split(",")))
         return ""
 
+    def get_sr_jabber_hosts_yml(self):
+        """Текст в ejabberd.cfg - имена хостов с которыми работает сервис"""
+        jabberHosts = self.Get("sr_jabber_hosts")
+        if jabberHosts:
+            return "\n".join(map(lambda x: '  - "%s"' % x, jabberHosts.split(",")))
+        return ""
+
     def get_sr_jabber_user_name(self):
         """Имя jabber пользователя (левая часть jabber id)"""
         userJid = self.Get("sr_jabber_user_id")
diff --git a/pym/cl_vars_server.py b/pym/cl_vars_server.py
index c66bd3a..2eeb339 100644
--- a/pym/cl_vars_server.py
+++ b/pym/cl_vars_server.py
@@ -163,6 +163,9 @@ class Data:
     # Текст в ejabberd.cfg - имена хостов с которыми работает сервис
     sr_jabber_hosts_pass = {}
 
+    # Текст в ejabberd.yml - имена хостов с которыми работает сервис
+    sr_jabber_hosts_yml = {}
+
     # jabber id пользователя
     sr_jabber_user_id = {'mode':"w"}