Merge remote-tracking branch 'origin/master'

.obsidian/workspace.json

@@ -48,9 +48,23 @@
               "icon": "lucide-file",
               "title": "git.moldev.ru"
             }
+          },
+          {
+            "id": "edd2df18ef64bf89",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
         ],
-        "currentTab": 2
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -205,10 +219,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "dab92b5f3112fa70",
+  "active": "edd2df18ef64bf89",
   "lastOpenFiles": [
-    "WORK & PROJECTS/Mol/Серверы/Jira - Service - Confluence - Crm.md",
     "WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
+    "conflict-files-obsidian-git.md",
+    "WORK & PROJECTS/Ulab/Сайт НИИСТРОМ/niistrom.zip",
+    "WORK & PROJECTS/Ulab/Сайт НИИСТРОМ",
+    "WORK & PROJECTS/Mol/Серверы/Jira - Service - Confluence - Crm.md",
     "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
     "WORK & PROJECTS/Mol/Ideas/Организационные идеи.md",
     "WORK & PROJECTS/Mol/Ideas/Технические идеи.md",
@@ -235,14 +252,11 @@
     "WORK & PROJECTS/Mol/Планы и диаграммы/СМК.md",
     "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/АФ-01 Альбом форм.pdf",
     "PERSONAL PROJECTS/P2EP/cdRead.canvas",
-    "conflict-files-obsidian-git.md",
     "P2EP/cdRead.canvas",
     "PERSONAL PROJECTS/P2EP",
     "PERSONAL PROJECTS",
-    "P2EP",
     "WORK & PROJECTS/img/Pasted image 20241212175419.png",
     "WORK & PROJECTS/img/Pasted image 20241212175847.png",
-    "SKILLS DOCS/kubernetes.pdf",
     "WORK & PROJECTS/Mol/Ideas/Пробоподготовка.md",
     "WORK & PROJECTS/Mol/Ideas/Единые сущности для каждого элемента БП.md",
     "WORK & PROJECTS/Mol/Ideas/ФСА - справочник показателей.md",

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

@@ -1,4 +1,4 @@
-root ljuJdjh5ljuJdjh5
+ root ljuJdjh5ljuJdjh5
 gitadmin ljuJdjh5ljuJdjh5
 postgres ljuJdjh5ljuJdjh5
 www-data 
@@ -41,7 +41,8 @@ sudo supervisorctl start laravel-worker:*
 
 ports:
 api:8000
-backend:3000
+frontend:3000
+admin:4000
 deploy:3333
 reverb:6001
 bitbicket:7990