Merge remote-tracking branch 'origin/master'

.obsidian/workspace.json

@@ -8,35 +8,34 @@
         "type": "tabs",
         "children": [
           {
-            "id": "5afb910d292b0d7d",
+            "id": "dab92b5f3112fa70",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "WORK & PROJECTS/Mol/Серверы/mail.mol-soft.ru.md",
+                "file": "WORK & PROJECTS/Mol/Серверы/00_Список серверов.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "mail.mol-soft.ru"
+              "title": "00_Список серверов"
             }
           },
           {
-            "id": "343836aed0394d03",
+            "id": "b7f7add54957a358",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "WORK & PROJECTS/Mol/Серверы/Jira - Service - Confluence - Crm.md",
+                "file": "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Jira - Service - Confluence - Crm"
+              "title": "Все идеи для Моли"
             }
           }
-        ],
+        ]
-        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -93,7 +92,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 418.5
+    "width": 399.5026054382324
   },
   "right": {
     "id": "5a12b65cf742d665",
@@ -190,49 +189,52 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "343836aed0394d03",
+  "active": "221c41e61c302338",
   "lastOpenFiles": [
-    "WORK & PROJECTS/Mol/Серверы/VPN-FIREWALL-GATE (Cerberus).md",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/~$ ЛИМС 10-02-25 (2).docx",
-    "WORK & PROJECTS/Ulab/Сайт НИИСТРОМ/niistrom.zip",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СПБ-ВетЛаб ТЗ ЛИМС 10-02-25.docx",
-    "WORK & PROJECTS/Ulab/Сайт НИИСТРОМ",
+    "WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
-    "WORK & PROJECTS/Mol/Планы и диаграммы/План СИЛА.md",
+    "WORK & PROJECTS/Mol/Серверы/Alfa prod.md",
-    "OLD PHP INSTALL.md",
-    "WORK & PROJECTS/Mol/Планы и диаграммы/1.0/1.0.md",
-    "WORK & PROJECTS/Mol/Планы и диаграммы/СМК.md",
-    "WORK & PROJECTS/Mol/Планы и диаграммы/План разработки.md",
-    "WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
-    "WORK & PROJECTS/Mol/Серверы/mail.mol-soft.ru.md",
-    "WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
-    "conflict-files-obsidian-git.md",
-    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
-    "WORK & PROJECTS/Ulab/Автобан/Формы_автобан.rar",
-    "WORK & PROJECTS/Ulab/Автобан",
-    "WORK & PROJECTS/Ulab/Aspro_docs/01.md",
-    "WORK & PROJECTS/Ulab/Aspro_docs",
-    "WORK & PROJECTS/Mol/Серверы/mol-desk.mol-soft.PRODs.md",
     "WORK & PROJECTS/Mol/Серверы/Jira - Service - Confluence - Crm.md",
-    "WORK & PROJECTS/Mol/Планы и диаграммы/1.0",
+    "WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
+    "WORK & PROJECTS/Mol/Серверы/VPN-FIREWALL-GATE (Cerberus).md",
     "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/АФ-01 Альбом форм.pdf",
-    "PERSONAL PROJECTS/Persona 1/Script Format.md",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/ГОСТ 17025 2019.pdf",
-    "PERSONAL PROJECTS/Persona 1",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Архитектура редактора и генератора (Alfa + Mol).canvas",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/СМК.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/План СИЛА.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/План разработки.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/1.0/1.0.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт.canvas",
+    "SKILLS DOCS/OLD PHP INSTALL.md",
+    "WORK & PROJECTS/Ulab/Доступы к точкам.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/ALFA 1.0",
+    "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
+    "WORK & PROJECTS/Mol/Серверы/00_Список серверов.md",
+    "WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
     "WORK & PROJECTS/Mol/Серверы/access.md",
     "WORK & PROJECTS/Mol/Серверы/1С Бухгалтерия.md",
-    "WORK & PROJECTS/Mol/Серверы/00_Список серверов.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт план.md",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм",
+    "WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт",
+    "WORK & PROJECTS/Mol/Серверы/mol-desk.mol-soft.PRODs.md",
+    "WORK & PROJECTS/Mol/Серверы/mail.mol-soft.ru.md",
+    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/С категориями/~$Критерии_оценки_поставщика_ЛИМС_Газпром-Нефть.xlsx",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/С категориями/ЛИМС_Опросный_лист_по_ФТТ_от_21_10_2024_для_Исполнителя.XLSX",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/С категориями/Критерии_оценки_поставщика_ЛИМС_Газпром-Нефть.xlsx",
+    "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/С категориями",
+    "WORK & PROJECTS/Mol/Серверы/moldev.ru.md",
+    "WORK & PROJECTS/Mol/Ideas/Организационные идеи.md",
+    "WORK & PROJECTS/Mol/Ideas/Технические идеи.md",
+    "conflict-files-obsidian-git.md",
+    "WORK & PROJECTS/Mol/Серверы/crm.mol-soft.ru.md",
     "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer 2.md",
     "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer.md",
-    "WORK & PROJECTS/Mol/Серверы/VPN-GATE (Cerberus).md",
+    "WORK & PROJECTS/Ulab/Aspro_docs/01.md",
-    "WORK & PROJECTS/Mol/Серверы/moldev.ru.md",
-    "WORK & PROJECTS/Mol/Серверы/mol-desk.ru PROD.md",
-    "WORK & PROJECTS/Mol/Серверы/Jira Confluence.md",
-    "WORK & PROJECTS/Mol/Серверы/crm.mol-soft.ru.md",
     "P2EP/cdRead.canvas",
-    "PERSONAL PROJECTS/P2EP",
-    "PERSONAL PROJECTS",
-    "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
     "WORK & PROJECTS/img/Pasted image 20241212175419.png",
     "WORK & PROJECTS/img/Pasted image 20241212175847.png",
-    "WORK & PROJECTS/Mol/Ideas/Пробоподготовка.md",
-    "WORK & PROJECTS/Mol/Ideas/Технические идеи.md",
     "WORK & PROJECTS/img/Pasted image 20241212175929.png",
     "WORK & PROJECTS/img/Pasted image 20241212175851.png",
     "Без названия 2.canvas",

WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md

@@ -22,7 +22,7 @@ https://config.fsa.gov.ru/api/dictionary/property_measured/elements?limit=1000
 
 ### Коннектор данных для интеграций (из очереди или тех. лога)
 и
-##### Внешний API для интеграции с CRM (для начала Alfa sync_messages)
+####  Внешний API для интеграции с любой CRM (для начала Alfa sync_messages)
 
 ### Модуль подписи любых документов и журналов  с помощью ЭЦП / встроенной учётной записью с поддержкой уровней подписи.
 

WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт план.md

@@ -0,0 +1,18 @@
+1. Загрузите ОА 
+2. Подтвердите и скорректируйте
+	- сведения о юр. лице 
+	- сведения о лаборатории
+	- сведения о филиалах 
+3. Загрузите Форму №6 - Помещения. Проверьте и скорректируйте данные при необходимости
+4. Загрузите Форму №1 - Сотрудники.  Проверьте и скорректируйте данные при необходимости (связь с отделениями)
+5. Матрица ответственности: назначьте ответственных исполнителей на методы испытаний 
+6. Создайте реестр оборудования: 
+	- Загрузите Форма № 2 - Средства измерения (СИ). Проверьте и скорректируйте данные при необходимости
+	- Загрузите Форма № 3 - Испытательное оборудование (ИО). Проверьте и скорректируйте данные при необходимости
+	- Загрузите Форма № 4 - Оснащенность вспомогательным оборудованием (ВО). Проверьте и скорректируйте данные при необходимости
+	- Загрузите Форма № 5 - Государственные стандартные образцы (ГСО). Проверьте и скорректируйте данные при необходимости
+7. Создайте или скорректируйте группы объектов испытания  
+8. Подтвердите ОА
+9. Загрузите данные о ваших заказчиках
+
+[[Быстрый старт.canvas|Быстрый старт ___ Схема]]

WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт.canvas

@@ -0,0 +1,22 @@
+{
+	"nodes":[
+		{"id":"327f6d317e1c915e","type":"group","x":-740,"y":-140,"width":640,"height":1270,"label":"USER GUI"},
+		{"id":"9b8591d4f1a60dc8","type":"text","text":"Подтерждение и корректировка сведения об юридическом лице, лабораториях и филиалах","x":-720,"y":-40,"width":600,"height":80,"color":"3"},
+		{"id":"61bd79588d282aa4","type":"text","text":"Указание помещений и связь с отделениями (форма 6)","x":-720,"y":60,"width":600,"height":50,"color":"3"},
+		{"id":"b5a402840ed81865","type":"text","text":"Указание сотрудников и связь с отделениями (форма 1)","x":-720,"y":140,"width":600,"height":50,"color":"3"},
+		{"id":"584cdb57931740d7","type":"text","text":" Матрица ответственности: назначение ответственных исполнителей на методы испытаний ","x":-720,"y":220,"width":600,"height":50,"color":"3"},
+		{"id":"96628c3fd969c868","type":"text","text":"Загрузка СИ (форма 2)","x":-720,"y":300,"width":600,"height":50,"color":"5"},
+		{"id":"efe6403442a3a2a4","type":"text","text":"ИМПОРТ PDF ФСА","x":-720,"y":-120,"width":600,"height":50,"color":"6"},
+		{"id":"38fcd3dae8893511","type":"text","text":"Backend","x":420,"y":-360,"width":250,"height":60},
+		{"id":"b0f58af78e86e3c8","type":"text","text":"Отправка заявлений в ФСА","x":-720,"y":1060,"width":600,"height":50,"color":"1"},
+		{"id":"e36ccc97b3129abd","type":"text","text":"Добавление методик вне ОА и информации из форм ФСА","x":-720,"y":980,"width":600,"height":50,"color":"1"},
+		{"id":"22a770b6132e6dab","type":"text","text":"Связь оборудования с методами","x":-720,"y":380,"width":600,"height":50,"color":"5"},
+		{"id":"d000833f4ef3f966","type":"text","text":"Импорт групп ОИ и корректировка (форма 3)","x":-720,"y":460,"width":600,"height":50,"color":"5"},
+		{"id":"b77e15760074338f","type":"text","text":"Импорт групп ВО и корректировка (форма 4)","x":-720,"y":540,"width":600,"height":50,"color":"5"},
+		{"id":"1a39c2b06a629093","type":"text","text":"Импорт групп ГСО и корректировка (форма 5)","x":-720,"y":620,"width":600,"height":50,"color":"5"},
+		{"id":"fe7f0c54b7c651f2","type":"text","text":"Импорт и подтверждение ОА","x":-720,"y":800,"width":600,"height":50,"color":"#44ff00"},
+		{"id":"45081c39c5e519b3","type":"text","text":"Подтверждение общих подгрупп ОИ","x":-720,"y":700,"width":600,"height":60,"color":"#44ff00"},
+		{"id":"008610d799408df6","x":-1280,"y":-148,"width":471,"height":973,"type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт план.md"}
+	],
+	"edges":[]
+}

WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Архитектура редактора и генератора (Alfa + Mol).canvas

@@ -0,0 +1,46 @@
+{
+	"nodes":[
+		{"id":"0bbe1ad23052dea9","type":"group","x":-1200,"y":-680,"width":620,"height":520,"label":"Хранилище форм"},
+		{"id":"33e41554713250b2","type":"group","x":-1640,"y":-680,"width":348,"height":520,"color":"6","label":"Редактор форм"},
+		{"id":"c77618e44187feca","type":"text","text":"# MOL-ADMIN-SUPPORT\nСчета на оплату","x":40,"y":-1210,"width":406,"height":130,"color":"1"},
+		{"id":"541d0759b29a780d","type":"text","text":"# MOL-DESK\nВыгрузка/сохранение форм с данными / отчётами","x":-335,"y":-1210,"width":250,"height":170,"color":"5"},
+		{"id":"bb7a7928bfc66590","type":"text","text":"# Редактор (UMO?)\nС поддержкой макросов и динамических таблиц\n","x":-1620,"y":-660,"width":308,"height":153},
+		{"id":"a2abf7aa1c4628b8","type":"text","text":"Редактирование иерархии документов, форматов страниц и выгрузки.\nПросмотр истории правок","x":-1620,"y":-507,"width":308,"height":104},
+		{"id":"a86efaf617938a7f","type":"text","text":"Модуль утверждения форм","x":-1620,"y":-317,"width":308,"height":60,"color":"1"},
+		{"id":"012205b5b52bf8c5","type":"text","text":"Типы форм, принадлежность к владельцу или к платформе","x":-1180,"y":-636,"width":250,"height":129},
+		{"id":"921924239f7de7a8","type":"text","text":"Каталог стандартных типов форм","x":-1180,"y":-507,"width":250,"height":52},
+		{"id":"dedcc773d0d12eb8","type":"text","text":"Хранение форм в БД","x":-1180,"y":-455,"width":250,"height":52},
+		{"id":"05eaa432738777c9","type":"text","text":"История правок форм","x":-1180,"y":-403,"width":250,"height":60},
+		{"id":"7328fa76eac59fb1","type":"text","text":"Макросы и их описания","x":-860,"y":-603,"width":250,"height":60},
+		{"id":"187ffc29a8407050","type":"text","text":"Необходимые для форм подписи","x":-1180,"y":-343,"width":250,"height":60},
+		{"id":"b4468c3e238a62d4","type":"text","text":"Фактические подписи форм","x":-1180,"y":-283,"width":250,"height":60},
+		{"id":"cfb8871964347014","type":"text","text":"*Раздельная совместимая реализация в Alfa и Mol c возможностью переноса данных*","x":-860,"y":-343,"width":250,"height":120,"color":"4"},
+		{"id":"e24c135dad74943a","type":"text","text":"# ALFA\nформирование документов","x":-977,"y":-1210,"width":234,"height":130,"color":"4"},
+		{"id":"341344a22a62fa61","type":"text","text":"###  БД mol","x":-172,"y":-880,"width":455,"height":60},
+		{"id":"e60ebf1e049c08da","type":"text","text":"### Запрос данных в документ (MOL)","x":-172,"y":-820,"width":455,"height":60},
+		{"id":"ef99c9394db92702","type":"text","text":"# СМК","x":-610,"y":-1210,"width":170,"height":130,"color":"5"},
+		{"id":"df3208e7759a94ee","type":"text","text":"# ALFA\nредактирование форм","x":-1583,"y":-1210,"width":234,"height":130,"color":"4"},
+		{"id":"4c354386c2712ee0","x":-1560,"y":8,"width":700,"height":72,"type":"text","text":"## Для реализации СМК нам нужна система прав в Mol"},
+		{"id":"b9fd8fb34faadcbf","x":-109,"y":-46,"width":329,"height":65,"type":"text","text":"### ДОКУМЕНТ ВЫГРУЗКИ"},
+		{"id":"8ab240e4608d9298","type":"text","text":"# API ГЕНЕРАТОР ДОКУМЕНТОВ\n## (ОБЩИЙ У MOL и ALFA ?????)","x":-184,"y":-487,"width":479,"height":134,"color":"3"},
+		{"id":"51769521b5c3d282","x":493,"y":-455,"width":180,"height":71,"type":"text","text":"### АРХИВ"},
+		{"id":"a4ea52130341850c","type":"text","text":"###  БД alfa + подготовка данных","x":-930,"y":-880,"width":531,"height":60},
+		{"id":"f43c229d74fbb1b5","type":"text","text":"### Предобработчик данных в документ (ALFA)","x":-930,"y":-820,"width":531,"height":60}
+	],
+	"edges":[
+		{"id":"444615d6bd5319cb","fromNode":"33e41554713250b2","fromSide":"right","toNode":"dedcc773d0d12eb8","toSide":"left"},
+		{"id":"21e3790afb3fbf2f","fromNode":"33e41554713250b2","fromSide":"right","toNode":"012205b5b52bf8c5","toSide":"left"},
+		{"id":"eab5f648745a2cb3","fromNode":"541d0759b29a780d","fromSide":"left","toNode":"ef99c9394db92702","toSide":"right"},
+		{"id":"3152ef812d80b78f","fromNode":"ef99c9394db92702","fromSide":"right","toNode":"541d0759b29a780d","toSide":"left"},
+		{"id":"d86a68ea6f56cf85","fromNode":"ef99c9394db92702","fromSide":"bottom","toNode":"33e41554713250b2","toSide":"top"},
+		{"id":"a28a562a5ecb66d0","fromNode":"df3208e7759a94ee","fromSide":"bottom","toNode":"33e41554713250b2","toSide":"top"},
+		{"id":"702c31ffcf34389f","fromNode":"0bbe1ad23052dea9","fromSide":"right","toNode":"8ab240e4608d9298","toSide":"left"},
+		{"id":"f3757f9527b01acb","fromNode":"e24c135dad74943a","fromSide":"bottom","toNode":"a4ea52130341850c","toSide":"top"},
+		{"id":"743b9e2a57242438","fromNode":"f43c229d74fbb1b5","fromSide":"bottom","toNode":"8ab240e4608d9298","toSide":"top"},
+		{"id":"6509d17e4cacd9c7","fromNode":"541d0759b29a780d","fromSide":"bottom","toNode":"341344a22a62fa61","toSide":"top"},
+		{"id":"a9591dc8339f9dc8","fromNode":"e60ebf1e049c08da","fromSide":"bottom","toNode":"8ab240e4608d9298","toSide":"top"},
+		{"id":"6b491032f9929bd0","fromNode":"8ab240e4608d9298","fromSide":"bottom","toNode":"b9fd8fb34faadcbf","toSide":"top"},
+		{"id":"3251f522d1fac586","fromNode":"8ab240e4608d9298","fromSide":"right","toNode":"51769521b5c3d282","toSide":"left"},
+		{"id":"b7c5bf3dc9b2edb6","fromNode":"c77618e44187feca","fromSide":"bottom","toNode":"341344a22a62fa61","toSide":"top"}
+	]
+}

WORK & PROJECTS/Mol/Серверы/00_Список серверов.md

@@ -1,10 +1,11 @@
 В работе
 
 - [[git.moldev.ru]]
-- [[moldev.ru]] (перейти на bitbucket )
 - [[1С Бухгалтерия]] (установить и протестировать)
+[[mail.mol-soft.ru]]
+[[Jira - Service - Confluence - Crm]] (перенести с moldev)
 
 Планируются
 - [[VPN-FIREWALL-GATE (Cerberus)]] (настроить доступы к инфраструктуре)
-- [[Jira - Service - Confluence - Crm]] (перенести с moldev)
 - [[mol-desk.mol-soft.PRODs]] (настроить полноценный прод с CI/CD)
+- mol-alfa.ru (Облачный сервер Alfa)

WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas

@@ -0,0 +1,66 @@
+{
+	"nodes":[
+		{"id":"e668ecad4af5b75d","type":"group","x":260,"y":-330,"width":320,"height":530,"label":"DOCKER CONTAINTERS"},
+		{"id":"72dae085047a9928","type":"group","x":-140,"y":160,"width":290,"height":420,"label":"🗃MariaDB Server"},
+		{"id":"2b14dcc74c2ea6d8","type":"group","x":260,"y":-810,"width":290,"height":300,"label":"Web"},
+		{"id":"4ef3c9c39cf49261","type":"group","x":-140,"y":-360,"width":290,"height":180,"label":"Исходные коды"},
+		{"id":"1400fca58b1081be","type":"group","x":640,"y":-330,"width":290,"height":160,"label":"Client1"},
+		{"id":"8baa0c9eec860ebe","type":"group","x":640,"y":-130,"width":290,"height":160,"label":"Client2"},
+		{"id":"eeb7d1ae3e55e3a9","type":"group","x":640,"y":80,"width":290,"height":160,"label":"Client3"},
+		{"id":"43b60b3e3edd88cf","type":"text","text":"📂bitrix sources","x":-120,"y":-340,"width":250,"height":60},
+		{"id":"b9a89b6c704bbab9","type":"text","text":"📂alfa sources (.git)","x":-120,"y":-260,"width":250,"height":60},
+		{"id":"88e977d27b7f415c","type":"text","text":"apache cloud API conf","x":280,"y":-790,"width":250,"height":60},
+		{"id":"ea6f72ceae655889","type":"text","text":"client1 apache reverse proxy","x":280,"y":-710,"width":250,"height":60,"color":"4"},
+		{"id":"546742f58a9feb77","type":"text","text":"client2 apache reverse proxy","x":280,"y":-650,"width":250,"height":60,"color":"4"},
+		{"id":"818ff03ad9e41a66","type":"text","text":"client3 apache reverse proxy","x":280,"y":-590,"width":250,"height":60,"color":"4"},
+		{"id":"0cfb0d2300a96176","type":"text","text":"liquibase update","x":-540,"y":-60,"width":250,"height":60},
+		{"id":"48c693eec010f00d","type":"text","text":"**Cloud Users DB**","x":-120,"y":180,"width":250,"height":50},
+		{"id":"f7aa319103f9c366","type":"text","text":"client1_db","x":-120,"y":230,"width":250,"height":50,"color":"6"},
+		{"id":"8a0ed6717109fccb","type":"text","text":"client2_db","x":-120,"y":280,"width":250,"height":50,"color":"6"},
+		{"id":"da4380327e36e455","type":"text","text":"client...._db","x":-120,"y":330,"width":250,"height":50,"color":"6"},
+		{"id":"e7df1d14d6f4f6c0","type":"text","text":"CLEAN_db","x":-120,"y":400,"width":250,"height":60},
+		{"id":"81ef5354684e699d","type":"text","text":"DEMO_DATA_db","x":-120,"y":500,"width":250,"height":60},
+		{"id":"f3d0e9a6d4d8e6a7","type":"text","text":"docker-compose.yml","x":-120,"y":20,"width":250,"height":60,"color":"4"},
+		{"id":"9cf121717dbde800","type":"text","text":"sql all bases update .sh script","x":-120,"y":-60,"width":250,"height":60,"color":"4"},
+		{"id":"7f1ca2cda9e89951","type":"text","text":"client 1\napache + php container","x":280,"y":-310,"width":250,"height":80},
+		{"id":"90d44e64ab154a1a","type":"text","text":"client 2\napache + php container","x":280,"y":-110,"width":250,"height":80},
+		{"id":"d0967a61e8872474","type":"text","text":"client 3\napache + php container","x":280,"y":100,"width":250,"height":80},
+		{"id":"be85b0f0c9d7c5c9","type":"text","text":"📂cache bitrix","x":660,"y":100,"width":250,"height":60,"color":"5"},
+		{"id":"16563c8fe55a26fe","type":"text","text":"📂doc_archive","x":660,"y":160,"width":250,"height":60,"color":"5"},
+		{"id":"7bb34343b485f669","type":"text","text":"📂cache bitrix","x":660,"y":-310,"width":250,"height":60,"color":"5"},
+		{"id":"1e42b8aa516bc15d","type":"text","text":"📂doc_archive","x":660,"y":-250,"width":250,"height":60,"color":"5"},
+		{"id":"15fc914984515332","type":"text","text":"📂cache bitrix","x":660,"y":-110,"width":250,"height":60,"color":"5"},
+		{"id":"339642f454dec00c","type":"text","text":"📂doc_archive","x":660,"y":-50,"width":250,"height":60,"color":"5"},
+		{"id":"6ed5eab6b8e16f3b","type":"text","text":"### CLOUD API (конфигурация облаков)\n- #### Регистрация нового клиента\n\t- создание новой БД клиента из CLEAN_db\n\t- внесение данных о клиенте в БД клиента\n\t- обновление cloud_users_db\n\t\t- поддомен и статус ssl-сертификатов\n\t\t- рабочий сервер\n\t\t- рабочая папка на сервере\n\t\t- настройки контейнера (подключенные модули, версия кода и тд)\n\t\t- тариф и крайняя дата исп.\n\t\t- БД\n\t\t- Часовой пояс\n\t\t- Информация о логине первого пользователя\n\t- переконфигурация сервера\n\t\t- создание/конфигурация файлов кэша, настроек php и индивидуальных архивов\n\t\t- пересоздание/обновление конфигов:\n\t\t\t- docker\n\t\t\t- apache\n\t\t\t- скрипт обновления БД (liquibase)\n\t\t- выпуск ssl нового поддомена\n\t\t- перезапуск apache & docker compose\n- #### Обновление информации клиента\n\t- тариф и дата последнего дня работы\n\t- подключённые опции (реконфиг docker)\n\t- часовой пояс php\n- #### Работа с демо-данными\n\t- активация демо-данных\n\t- удаление демо-данных\n- #### Удаление клиента\n\t- очистка БД клиента\n\t- пересоздание конфигов сервера\n\t- чистка файлов (контейнеры и конфиги)","x":1080,"y":-560,"width":460,"height":1020},
+		{"id":"22120c2e0489d623","type":"text","text":"# 🗄 git.moldev.ru","x":-590,"y":-820,"width":300,"height":60},
+		{"id":"7ae28a819183d708","type":"text","text":"Папки клиентских данных","x":1185,"y":620,"width":250,"height":60,"color":"5"},
+		{"id":"2b6e0e1051629348","type":"text","text":"Обновляемые конфиги","x":880,"y":620,"width":240,"height":50,"color":"4"},
+		{"id":"72b797b472986e84","type":"text","text":"Клиентские БД","x":1480,"y":625,"width":250,"height":55,"color":"6"}
+	],
+	"edges":[
+		{"id":"6a1c2335c8f33e19","fromNode":"22120c2e0489d623","fromSide":"bottom","toNode":"b9a89b6c704bbab9","toSide":"left","label":"code update"},
+		{"id":"3a2353b57b6c9648","fromNode":"b9a89b6c704bbab9","fromSide":"left","toNode":"0cfb0d2300a96176","toSide":"top","label":"sql update\nfrom source"},
+		{"id":"a9bae7cd7b069f6b","fromNode":"0cfb0d2300a96176","fromSide":"bottom","toNode":"f7aa319103f9c366","toSide":"left"},
+		{"id":"6b1e5994754975a5","fromNode":"0cfb0d2300a96176","fromSide":"bottom","toNode":"8a0ed6717109fccb","toSide":"left"},
+		{"id":"91542fbd7634facd","fromNode":"0cfb0d2300a96176","fromSide":"bottom","toNode":"da4380327e36e455","toSide":"left"},
+		{"id":"86a88d222cf75ade","fromNode":"0cfb0d2300a96176","fromSide":"bottom","toNode":"e7df1d14d6f4f6c0","toSide":"left"},
+		{"id":"ddd45a698fdc8d4c","fromNode":"9cf121717dbde800","fromSide":"left","toNode":"0cfb0d2300a96176","toSide":"right"},
+		{"id":"fa8e3d0abfcc09e3","fromNode":"88e977d27b7f415c","fromSide":"right","toNode":"6ed5eab6b8e16f3b","toSide":"top"},
+		{"id":"18c5b61b8b5a1739","fromNode":"7f1ca2cda9e89951","fromSide":"right","toNode":"7bb34343b485f669","toSide":"left"},
+		{"id":"03be00fa550b6603","fromNode":"7f1ca2cda9e89951","fromSide":"right","toNode":"1e42b8aa516bc15d","toSide":"left"},
+		{"id":"6aad9f1ddd433a56","fromNode":"ea6f72ceae655889","fromSide":"left","toNode":"7f1ca2cda9e89951","toSide":"left"},
+		{"id":"4bd80150558a22ed","fromNode":"546742f58a9feb77","fromSide":"left","toNode":"90d44e64ab154a1a","toSide":"left"},
+		{"id":"bb47876001260151","fromNode":"818ff03ad9e41a66","fromSide":"left","toNode":"d0967a61e8872474","toSide":"left"},
+		{"id":"3729d10a1baacb22","fromNode":"4ef3c9c39cf49261","fromSide":"right","toNode":"7f1ca2cda9e89951","toSide":"left"},
+		{"id":"d5d9a7e4841f8fa7","fromNode":"4ef3c9c39cf49261","fromSide":"right","toNode":"90d44e64ab154a1a","toSide":"left"},
+		{"id":"956be62c7f46393a","fromNode":"4ef3c9c39cf49261","fromSide":"right","toNode":"d0967a61e8872474","toSide":"left"},
+		{"id":"076fd8ec5feb479f","fromNode":"90d44e64ab154a1a","fromSide":"right","toNode":"15fc914984515332","toSide":"left"},
+		{"id":"aa314e5b7bd2a637","fromNode":"90d44e64ab154a1a","fromSide":"right","toNode":"339642f454dec00c","toSide":"left"},
+		{"id":"8b9545120a460534","fromNode":"f3d0e9a6d4d8e6a7","fromSide":"right","toNode":"e668ecad4af5b75d","toSide":"left"},
+		{"id":"251fbf76ef5bad44","fromNode":"d0967a61e8872474","fromSide":"right","toNode":"be85b0f0c9d7c5c9","toSide":"left"},
+		{"id":"57b3b31429977898","fromNode":"d0967a61e8872474","fromSide":"right","toNode":"16563c8fe55a26fe","toSide":"left"},
+		{"id":"89a1a5ffc139910d","fromNode":"6ed5eab6b8e16f3b","fromSide":"bottom","toNode":"2b6e0e1051629348","toSide":"top"},
+		{"id":"ffb10a9866c319c7","fromNode":"6ed5eab6b8e16f3b","fromSide":"bottom","toNode":"7ae28a819183d708","toSide":"top"},
+		{"id":"67c8b9575b718061","fromNode":"6ed5eab6b8e16f3b","fromSide":"bottom","toNode":"72b797b472986e84","toSide":"top"}
+	]
+}

WORK & PROJECTS/Mol/Серверы/VPN-FIREWALL-GATE (Cerberus).md

@@ -0,0 +1 @@
+ REVERSE PROXY + FIREWALL

WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md

@@ -7,6 +7,9 @@ mariadb
 baseadmin
 mysqlmysqlmysqlmysql4
 
+**backup**
+mariadb-dump --databases CLEAN | gzip -c > /home/moladmin/backup/CLEAN_$(date +"%Y%m%d_%H%M.sql.gz")
+
 
 bitbucket / bamboo
 administrator OtX4TPDrA4nE2jNV главный администратор bitbucket

WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas

@@ -1,13 +1,13 @@
 {
 	"nodes":[
 		{"id":"b4b26b5ea7c96446","type":"text","text":"Beget","x":-960,"y":-673,"width":680,"height":701},
-		{"id":"0103d77dbe794bef","type":"text","text":"firstvds","x":-1520,"y":-672,"width":520,"height":701},
-		{"id":"6ac127d86d27711a","type":"file","file":"WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md","x":-1460,"y":-419,"width":400,"height":50,"color":"4"},
-		{"id":"7cab99cbcc329310","type":"file","file":"WORK & PROJECTS/Mol/Серверы/mail.mol-soft.ru.md","x":-1460,"y":-289,"width":400,"height":55,"color":"4"},
 		{"id":"74a9c9df4b90fdb3","type":"file","file":"WORK & PROJECTS/Mol/Серверы/Jira - Service - Confluence - Crm.md","x":-900,"y":-419,"width":560,"height":50,"color":"5"},
 		{"id":"b0513e10e691a707","type":"file","file":"WORK & PROJECTS/Mol/Серверы/mol-desk.mol-soft.PRODs.md","x":-900,"y":-289,"width":560,"height":55,"color":"1"},
 		{"id":"49ccb0df1f6b1353","type":"file","file":"WORK & PROJECTS/Mol/Серверы/1С Бухгалтерия.md","x":-900,"y":-160,"width":560,"height":50,"color":"4"},
-		{"id":"898531ae75948834","type":"file","file":"WORK & PROJECTS/Mol/Серверы/VPN-FIREWALL-GATE (Cerberus).md","x":-900,"y":-600,"width":400,"height":60,"color":"1"}
+		{"id":"898531ae75948834","type":"file","file":"WORK & PROJECTS/Mol/Серверы/VPN-FIREWALL-GATE (Cerberus).md","x":-900,"y":-600,"width":400,"height":60,"color":"1"},
+		{"id":"6ac127d86d27711a","type":"file","file":"WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md","x":-2340,"y":-372,"width":400,"height":50,"color":"4"},
+		{"id":"7cab99cbcc329310","type":"file","file":"WORK & PROJECTS/Mol/Серверы/mail.mol-soft.ru.md","x":-2340,"y":-242,"width":400,"height":55,"color":"4"},
+		{"id":"0103d77dbe794bef","type":"text","text":"firstvds","x":-2400,"y":-625,"width":520,"height":701}
 	],
 	"edges":[]
 }