TelenkovDmitry hace 3 meses
padre
commit
50dd7f7691

+ 22 - 13
.obsidian/workspace.json

@@ -13,12 +13,12 @@
             "state": {
             "state": {
               "type": "markdown",
               "type": "markdown",
               "state": {
               "state": {
-                "file": "Django/common.md",
+                "file": "Python/function основное.md",
                 "mode": "source",
                 "mode": "source",
                 "source": false
                 "source": false
               },
               },
               "icon": "lucide-file",
               "icon": "lucide-file",
-              "title": "common"
+              "title": "function основное"
             }
             }
           }
           }
         ]
         ]
@@ -43,7 +43,7 @@
                 "sortOrder": "alphabetical"
                 "sortOrder": "alphabetical"
               },
               },
               "icon": "lucide-folder-closed",
               "icon": "lucide-folder-closed",
-              "title": "Files"
+              "title": "Файловый менеджер"
             }
             }
           },
           },
           {
           {
@@ -129,25 +129,34 @@
   },
   },
   "left-ribbon": {
   "left-ribbon": {
     "hiddenItems": {
     "hiddenItems": {
-      "switcher:Open quick switcher": false,
-      "graph:Open graph view": false,
-      "canvas:Create new canvas": false,
-      "command-palette:Open command palette": false,
-      "markdown-importer:Open format converter": false
+      "switcher:Меню быстрого перехода": false,
+      "graph:Граф": false,
+      "canvas:Создать новый холст": false,
+      "command-palette:Открыть палитру команд": false,
+      "markdown-importer:Импорт Markdown-файлов": false
     }
     }
   },
   },
   "active": "e75e3d552ba44622",
   "active": "e75e3d552ba44622",
   "lastOpenFiles": [
   "lastOpenFiles": [
-    "todo/Задачи по направлениям.md",
+    "Python/common.md",
+    "Python/Архитектура.md",
+    "Python/venv.md",
+    "Python/sort.md",
     "Python/function основное.md",
     "Python/function основное.md",
+    "todo/Задачи по направлениям.md",
+    "proGit.md",
+    "linux/server.md",
+    "configs/tab_wg.conf",
+    "configs/tab_wg.conf.txt",
+    "configs/phone_wg.conf",
+    "configs/phone_wg.conf.txt",
+    "configs/wg0_new.conf",
+    "configs/wg0_new.conf.txt",
     "Django/common.md",
     "Django/common.md",
     "English/Text 3.md",
     "English/Text 3.md",
     "English/Homework.md",
     "English/Homework.md",
     "English/Text 2.md",
     "English/Text 2.md",
-    "linux/server.md",
     "ROTEK/bt6714.md",
     "ROTEK/bt6714.md",
-    "English/img/Dialogue_4.jpg",
-    "proGit.md",
-    "Python/venv.md"
+    "English/img/Dialogue_4.jpg"
   ]
   ]
 }
 }

+ 1 - 1
configs/alex_wg.conf

@@ -7,7 +7,7 @@ Jmin = 2
 Jmax = 10
 Jmax = 10
 
 
 [Peer]
 [Peer]
-PublicKey = OAyEBLq2HWmYgtVjUS/DDkzsimy2OmJxkWc8e04FTkA=
+PublicKey = qFZSkOW6PEiFSiuIdrs2JRml9P4O32HoYkQHdi21yj4=
 Endpoint = 94.232.244.161:51841
 Endpoint = 94.232.244.161:51841
 AllowedIPs = 0.0.0.0/0
 AllowedIPs = 0.0.0.0/0
 PersistentKeepalive = 20
 PersistentKeepalive = 20

+ 13 - 0
configs/phone_wg.conf

@@ -0,0 +1,13 @@
+[Interface]
+PrivateKey = qLtMJvDRQwhfSilPh3xW8qR9nueWgYDOhv1YpW1WXls=
+Address = 10.0.0.7/32
+DNS = 8.8.8.8
+Jc = 4
+Jmin = 2
+Jmax = 10
+
+[Peer]
+PublicKey = qFZSkOW6PEiFSiuIdrs2JRml9P4O32HoYkQHdi21yj4=
+Endpoint = 94.232.244.161:51841
+AllowedIPs = 0.0.0.0/0
+PersistentKeepalive = 20

+ 13 - 0
configs/tab_wg.conf

@@ -0,0 +1,13 @@
+[Interface]
+PrivateKey = yLdjiGv10cqFJRrKV0uKZIWBjY2KILGlamx6zPwX334=
+Address = 10.0.0.8/32
+DNS = 8.8.8.8
+Jc = 4
+Jmin = 2
+Jmax = 10
+
+[Peer]
+PublicKey = qFZSkOW6PEiFSiuIdrs2JRml9P4O32HoYkQHdi21yj4=
+Endpoint = 94.232.244.161:51841
+AllowedIPs = 0.0.0.0/0
+PersistentKeepalive = 20

+ 13 - 0
configs/wg0_new.conf

@@ -0,0 +1,13 @@
+[Interface]
+PrivateKey = YEJRCVyhrg3AjbC1405SseGofJHOBbNTrIaB0AgD13c=
+Address = 10.0.0.3/32
+DNS = 8.8.8.8
+Jc = 4
+Jmin = 2
+Jmax = 10
+
+[Peer]
+PublicKey = qFZSkOW6PEiFSiuIdrs2JRml9P4O32HoYkQHdi21yj4=
+Endpoint = 94.232.244.161:51841
+AllowedIPs = 0.0.0.0/0
+PersistentKeepalive = 20

+ 4 - 0
linux/server.md

@@ -113,6 +113,10 @@ $ sudo apt install -y wireguard
 $ cd /etc/wireguard
 $ cd /etc/wireguard
 $ wg genkey | tee /etc/wireguard/privatkey | wg pubkey | tee /etc/wireguard/pubkey # создать ключи
 $ wg genkey | tee /etc/wireguard/privatkey | wg pubkey | tee /etc/wireguard/pubkey # создать ключи
 ```
 ```
+Пользователь root:
+```bash
+$ sudo -s
+```
 Создать в `/etc/wireguard` файл `wg0.conf`:
 Создать в `/etc/wireguard` файл `wg0.conf`:
 ```bash
 ```bash
 [Interface]  
 [Interface]  

+ 1 - 1
todo/Задачи по направлениям.md

@@ -8,7 +8,7 @@
 <h6>Финансы:</h6>
 <h6>Финансы:</h6>
 - [ ] Разобраться со вкладом в ПСБ
 - [ ] Разобраться со вкладом в ПСБ
 <h6>Бытовые:</h6>
 <h6>Бытовые:</h6>
-- [ ] Сделать VPN на планшете
+- [x] Сделать VPN на планшете
 - [ ] Починить кухонный стул
 - [ ] Починить кухонный стул
 - [ ] Купить зимнюю куртку
 - [ ] Купить зимнюю куртку
 - [ ] Починить санки
 - [ ] Починить санки