Compare commits

..

10 Commits

Author SHA1 Message Date
9fed7ff467 Update helm-library Docker tag to v0.2.6
Some checks failed
renovate/artifacts Artifact file update failure
ci/woodpecker/push/woodpecker Pipeline was successful
2025-06-16 01:01:55 +00:00
8e74f227e7 Update the hostname
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Signed-off-by: Nikolai Rodionov <allanger@badhouseplants.net>
2025-05-31 23:33:09 +02:00
1cbc35eb63 Use rootless container
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-03-01 20:04:43 +01:00
41a5494233 Add android docs
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-02-15 17:28:50 +01:00
c9cecbcf3e Use nginx rootless ports
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-02-15 16:48:36 +01:00
e2633f55b8 Try rootless nginx
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2025-02-15 16:48:01 +01:00
1fe0a9d815 Try rootless nginx
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-02-15 15:02:03 +01:00
42479636f2 Fix ci
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2025-02-15 14:55:14 +01:00
f8fc2c3cf1 Fix ci
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2025-02-15 14:54:01 +01:00
4726009e85 Fix paths 2025-02-15 14:49:57 +01:00
13 changed files with 51 additions and 28 deletions

View File

@ -8,19 +8,18 @@ steps:
image: zot.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
environment:
BUILDAH_REG: zot.badhouseplants.net/badhouseplants/xray-docs
REGISTRY_TOKEN:
from_secret: registry_token
privileged: true
secrets:
- registry_token
commands:
- build-container
backend_options:
kubernetes:
resources:
requests:
memory: 200Mi
memory: 500Mi
cpu: 200m
limits:
memory: 200Mi
cpu: 200m
memory: 500Mi
securityContext:
privileged: true

View File

@ -7,5 +7,5 @@ COPY . .
RUN python -m poetry install --no-root
RUN python -m poetry run mkdocs build
FROM nginx:1.27.4
FROM nginxinc/nginx-unprivileged
COPY --from=builder /src/site /usr/share/nginx/html

View File

@ -1,3 +1,27 @@
# Настройка на Android
TO BE DONE
## Подготовка
Скачиваем программу v2rayNG по ссылке: <https://play.google.com/store/apps/details?id=com.v2ray.ang&pcampaignid=web_share>
## Настройка
1. Выбираем "Добавить новый сервер"
![v2rayNG](assets/android/v2rayNG_1.jpg)
2. Выбираем "Type manually[VLESS]"
![v2rayNG](assets/android/v2rayNG_2.jpg)
3. Вводим данные
- **remarks:**: Любое название, которые придет вам в голову
- **address:**: `tiramisu.badhouseplants.net`
- **port:** `27015`
- **id:** ID, который вы получите после соглашения с ToC
- **flow:** `xtls-rpx-rx-vision`
- **SNI:** `tiramisu.badhouseplants.net`
Остальное оставить дефолтными, можете сравнить значения со скриншотами:
![v2rayNG](assets/android/v2rayNG_3.jpg)
![v2rayNG](assets/android/v2rayNG_4.jpg)

View File

@ -8,23 +8,23 @@
1. Выбираем добавить новый сервер
![FoXray](../assets/ios/FoXray_1.png)
![FoXray](assets/ios/FoXray_1.png)
2. Вводим данные
- **name:** Любое название, которое придет вам в голову
- **prorocol**: `VLESS`
- **address**: `xray-public.badhouseplants.net`
- **address**: `tiramisu.badhouseplants.net`
- **port**: `27015`
- **uuid**: ID, который вы получите после соглашения с ToC
- **flow**: `xtls-rprx-vision`
- **transport**: `raw`
- **header**: `none`
- **security**: tls
- **serverName**: `xray-public.badhouseplants.net`
- **serverName**: `tiramisu.badhouseplants.net`
- **allowInsecure**: `false`
Остальное оставить дефолтными, можете сравнить значения со скриншотами:
![FoXray](../assets/ios/FoXray_2.png)
![FoXray](../assets/ios/FoXray_3.png)
![FoXray](assets/ios/FoXray_2.png)
![FoXray](assets/ios/FoXray_3.png)

View File

@ -6,22 +6,22 @@
1. Выбираем добавить новый сервер
![FoXray](../assets/macos/MacOS_FoXray_1.png)
![FoXray](assets/macos/MacOS_FoXray_1.png)
2. Вводим данные
- **name:** Любое название, которое придет вам в голову
- **prorocol**: `VLESS`
- **address**: `xray-public.badhouseplants.net`
- **address**: `tiramisu.badhouseplants.net`
- **port**: `27015`
- **uuid**: ID, который вы получите после соглашения с ToC
- **flow**: `xtls-rprx-vision`
- **transport**: `raw`
- **header**: `none`
- **security**: tls
- **serverName**: `xray-public.badhouseplants.net`
- **serverName**: `tiramisu.badhouseplants.net`
- **allowInsecure**: `false`
Остальное оставить дефолтными, можете сравнить значения со скриншотами:
![FoXray](../assets/macos/MacOS_FoXray_2.png)
![FoXray](assets/macos/MacOS_FoXray_2.png)

View File

@ -2,10 +2,10 @@
## Подготовка
Скачиваем программу v2rayN по ссылке: <https://github.com/2dust/v2rayN/releases/latest>
1. Скачиваем программу v2rayN по ссылке: <https://github.com/2dust/v2rayN/releases/latest>
Для простоты настройки лучше всего выбрать `v2rayN-windows-64-With-Core.zip`
![Windows](../assets/windows/Windows_Download.png)
![Windows](assets/windows/Windows_Download.png)
> Пользователям Windows 7 придется скачать более старую версию v2rayN и установить другую версию ядра Xray (Документация будет добавлена позже)
2. Распаковываем архив и открываем

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

View File

@ -41,9 +41,9 @@
## Настройка на разных системах
- Настройка на [Windows](./windows.md)
- Настройка на [iOS](./ios.md)
- Настройка на [macOS](./macOS.md)
- Настройка на [Windows](./1_windows.md)
- Настройка на [iOS](./1_ios.md)
- Настройка на [macOS](./1_macos.md)
## Рутинги

View File

@ -9,7 +9,7 @@ maintainers:
url: https://badhouseplants.net
dependencies:
- name: helm-library
version: 0.2.1
version: 0.2.6
repository: oci://ghcr.io/allanger/allangers-helm-library
annotations:
allowed_workload_kinds: "Deployment"

View File

@ -20,13 +20,13 @@ base:
livenessProbe:
httpGet:
path: /
port: 80
port: 8080
initialDelaySeconds: 3
periodSeconds: 3
readinessProbe:
httpGet:
path: /
port: 80
port: 8080
initialDelaySeconds: 3
periodSeconds: 3
volumeMounts:
@ -55,7 +55,7 @@ ingress:
service:
name: '{{ include "chart.fullname" $ }}-main'
port:
number: 80
number: 8080
path: /
pathType: Prefix
tls:
@ -68,6 +68,6 @@ services:
type: ClusterIP
ports:
http:
port: 80
targetPort: 80
port: 8080
targetPort: 8080
protocol: TCP