vault backup: 2025-03-01 19:47:37

2025-03-01 19:47:37 +05:00
parent 03a9cd4dc9
commit 1b57dc1146
3 changed files with 25 additions and 32 deletions
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -15,9 +15,9 @@
              "state": {
                "file": "WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
                "viewState": {
-                  "x": 418.2672696017411,
-                  "y": -114.45476075674947,
-                  "zoom": -0.4605934636868143
+                  "x": 353.22052441319386,
+                  "y": -143.5582356454103,
+                  "zoom": 0.26970326815659273
                }
              },
              "icon": "lucide-layout-dashboard",
@@ -38,8 +38,7 @@
              "title": "Alfa cloud readme"
            }
          }
-        ],
-        "currentTab": 1
+        ]
      }
    ],
    "direction": "vertical"
@@ -196,10 +195,10 @@
      "canvas2document:C2D Step 2 - Make cleared document": false
    }
  },
-  "active": "4e37f7bc6712d830",
+  "active": "dab92b5f3112fa70",
  "lastOpenFiles": [
-    "WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
    "WORK & PROJECTS/Mol/Серверы/Alfa cloud readme.md",
+    "WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
    "WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
    "WORK & PROJECTS/Mol/Серверы/00_Список серверов.md",
    "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
--- a/PROJECTS/Mol/Серверы/Alfa
+++ b/PROJECTS/Mol/Серверы/Alfa
@@ -2,14 +2,12 @@
 	"nodes":[
 		{"id":"1147ad5342f8a66d","type":"group","x":-560,"y":-1000,"width":1760,"height":2840,"label":"PROD 1"},
 		{"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":560,"label":"🗃MariaDB Server"},
 		{"id":"2b14dcc74c2ea6d8","type":"group","x":260,"y":-880,"width":290,"height":400,"label":"Web"},
-		{"id":"4ef3c9c39cf49261","type":"group","x":-140,"y":-360,"width":290,"height":180,"label":"Исходные коды"},
+		{"id":"72dae085047a9928","type":"group","x":-140,"y":380,"width":290,"height":360,"label":"🗃MariaDB Server"},
 		{"id":"1400fca58b1081be","type":"group","x":660,"y":-410,"width":290,"height":180,"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":"0cfb0d2300a96176","type":"text","text":"liquibase update","x":-540,"y":-60,"width":250,"height":60},
-		{"id":"43b60b3e3edd88cf","type":"text","text":"📂bitrix sources","x":-120,"y":-340,"width":250,"height":60},
+		{"id":"4ef3c9c39cf49261","type":"group","x":-140,"y":-360,"width":290,"height":140,"label":"Исходные коды"},
 		{"id":"2b6e0e1051629348","type":"text","text":"Обновляемые конфиги","x":280,"y":1580,"width":240,"height":50,"color":"4"},
 		{"id":"7ae28a819183d708","type":"text","text":"Папки клиентских данных","x":585,"y":1580,"width":250,"height":60,"color":"5"},
 		{"id":"72b797b472986e84","type":"text","text":"Клиентские БД","x":880,"y":1585,"width":250,"height":55,"color":"6"},
@@ -24,36 +22,29 @@
 		{"id":"818ff03ad9e41a66","type":"text","text":"client3 nginx reverse proxy","x":280,"y":-650,"width":250,"height":60,"color":"4"},
 		{"id":"9ac7fb4c1839d1c1","type":"text","text":"1C:CRM API","x":280,"y":-560,"width":250,"height":50},
 		{"id":"f3d0e9a6d4d8e6a7","type":"text","text":"docker-compose.yml","x":-120,"y":20,"width":250,"height":60,"color":"4"},
-		{"id":"b9a89b6c704bbab9","type":"text","text":"📂alfa sources (.git)","x":-120,"y":-260,"width":250,"height":60},
-		{"id":"f7aa319103f9c366","type":"text","text":"client1_db","x":-120,"y":305,"width":250,"height":50,"color":"6"},
-		{"id":"8a0ed6717109fccb","type":"text","text":"client2_db","x":-120,"y":355,"width":250,"height":50,"color":"6"},
-		{"id":"da4380327e36e455","type":"text","text":"client...._db","x":-120,"y":405,"width":250,"height":50,"color":"6"},
-		{"id":"e7df1d14d6f4f6c0","type":"text","text":"CLEAN_db","x":-120,"y":475,"width":250,"height":60},
-		{"id":"81ef5354684e699d","type":"text","text":"DEMO_DATA_db","x":-120,"y":575,"width":250,"height":60},
-		{"id":"48c693eec010f00d","type":"text","text":"**Cloud Users Table**\n**Servers table**","x":-120,"y":180,"width":250,"height":100},
-		{"id":"3aab9f55469feb04","x":1540,"y":1200,"width":250,"height":143,"type":"text","text":"Server monitoring:\nhttps://linuxblog.io/free-linux-server-monitoring-apm-sysadmins/"},
+		{"id":"3aab9f55469feb04","type":"text","text":"Server monitoring:\nhttps://linuxblog.io/free-linux-server-monitoring-apm-sysadmins/","x":1540,"y":1200,"width":250,"height":143},
 		{"id":"6ed5eab6b8e16f3b","type":"text","text":"### CLOUD API (конфигурация облаков)\n- #### Регистрация нового клиента\n\t- создание новой БД клиента из CLEAN_db\n\t- внесение данных о клиенте в БД клиента\n\t- обновление cloud_users_db\n\t\t- поддомен\n\t\t- статус ssl-сертификатов\n\t\t- порт подключения\n\t\t- id сервера\n\t\t- рабочая папка на сервере\n\t\t- настройки контейнера (подключенные модули, версия кода и тд)\n\t\t- версия контейнера (1.3-master, 1.4-dev)\n\t\t- крайняя дата исп.\n\t\t- тип лицензии (demo, SILA)\n\t\t- БД\n\t\t- Часовой пояс\n\t\t- Информация о логине первого пользователя\n\t\t\t- ФИО\n\t\t\t- e-mail\n\t\t\t- password\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":450,"y":355,"width":510,"height":1065},
 		{"id":"22120c2e0489d623","type":"text","text":"# 🗄 git.moldev.ru","x":-415,"y":-1200,"width":300,"height":60},
 		{"id":"7bb34343b485f669","type":"text","text":"📂 Storage","x":680,"y":-390,"width":250,"height":50,"color":"5"},
 		{"id":"1e42b8aa516bc15d","type":"text","text":"📄 .env","x":680,"y":-340,"width":250,"height":50,"color":"5"},
 		{"id":"c32289bb4203dbfd","type":"text","text":"📂 Logs","x":680,"y":-290,"width":250,"height":50,"color":"5"},
-		{"id":"9cf121717dbde800","type":"text","text":"sql all bases update .sh script","x":-240,"y":-60,"width":250,"height":60,"color":"4"}
+		{"id":"0cfb0d2300a96176","type":"text","text":"php artisan migrate","x":-540,"y":210,"width":250,"height":60},
+		{"id":"8a0ed6717109fccb","type":"text","text":"client2_db","x":-120,"y":590,"width":250,"height":50,"color":"6"},
+		{"id":"da4380327e36e455","type":"text","text":"client...._db","x":-120,"y":640,"width":250,"height":50,"color":"6"},
+		{"id":"48c693eec010f00d","type":"text","text":"**Cloud Users Table**\n**Servers table**","x":-120,"y":415,"width":250,"height":100},
+		{"id":"f7aa319103f9c366","type":"text","text":"client1_db","x":-120,"y":540,"width":250,"height":50,"color":"6"},
+		{"id":"b9a89b6c704bbab9","type":"text","text":"📂alfa sources (.git)","x":-120,"y":-315,"width":250,"height":60}
 	],
 	"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":"16f08ef6b7358e0b","toSide":"top"},
 		{"id":"18c5b61b8b5a1739","fromNode":"7f1ca2cda9e89951","fromSide":"right","toNode":"1400fca58b1081be","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":"d5d9a7e4841f8fa7","fromNode":"4ef3c9c39cf49261","fromSide":"right","toNode":"90d44e64ab154a1a","toSide":"left"},
-		{"id":"956be62c7f46393a","fromNode":"4ef3c9c39cf49261","fromSide":"right","toNode":"d0967a61e8872474","toSide":"left"},
 		{"id":"8b9545120a460534","fromNode":"f3d0e9a6d4d8e6a7","fromSide":"right","toNode":"e668ecad4af5b75d","toSide":"left"},
 		{"id":"89a1a5ffc139910d","fromNode":"6ed5eab6b8e16f3b","fromSide":"bottom","toNode":"2b6e0e1051629348","toSide":"top"},
 		{"id":"ffb10a9866c319c7","fromNode":"6ed5eab6b8e16f3b","fromSide":"bottom","toNode":"7ae28a819183d708","toSide":"top"},
--- a/PROJECTS/Mol/Серверы/Alfa
+++ b/PROJECTS/Mol/Серверы/Alfa
@@ -16,8 +16,8 @@ GET:
 	/servers/{id} — получить подробную информацию о сервере
 		(TODO: с параметрами мониторинга и нагрузкой в реальном времени)
 	/clients — получить список контейнеров клиентов со всеми подробностями (поддерживается пагинация). С флагом доступностью контейнера. На фронте можно сделать прямой переход на облако клиента.
-	/clients/{id}/demo_enable - применение таблиц демо-данных
-	/clients/{id}/demo_disable - удаление демо-данных
+	/clients/{id}/demo_enable - применение таблиц демо-данных (demo seeder)
+	/clients/{id}/demo_disable - удаление демо-данных (demo inverse seeder)
 	/clients/{id}/maintain_enable - включить страницу "Техническое обслуживание" у клиента
 	/clients/{id}/maintain_disable - отключить страницу "Техническое обслуживание"
 	/clients/{id}/send_success - отправить письмо клиенту с успешной регистрацией облака с логином и паролем
@@ -53,15 +53,18 @@ DELETE

 Команды менеджмента контейнеров и деплоя (GET)
 ```
+	/containers/avialable
 	/servers/{id}/reboot_server - перезапуск сервера
 	/clients/{id}/reboot - попытка перезапуска контейнера пользователя
+	/clients/deploy - пересоздание конфигов и перезапуск серверного кластера
 	/clients/{id}/create_log - Лог создания контейнера

-	/container/build_dev
-	/container/build_prod
-	/client/{id}/migrate
-	/client/migrate_all
-	/client/set_container
+	/containers/build_dev - переключение кода на ветку dev, сборка контейнера
+	/containers/build_prod
+	/clients/{id}/migrate
+	/clients/migrate_all
+	/clients/{id}/switch
+	/clients/switch_all
 	
 ```