aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2024-11-11 01:12:29 +0800
committerYuqian Yang <crupest@crupest.life>2024-12-19 21:42:01 +0800
commitf9aa02ec1a4c24e80a206857d4f68198bb027bb4 (patch)
tree5994f0a62733b13f9f330e3515260ae20dc4a0bd
parent7b4d49e4bbdff6ddf1f8f7e937130e700024d5e9 (diff)
downloadcrupest-f9aa02ec1a4c24e80a206857d4f68198bb027bb4.tar.gz
crupest-f9aa02ec1a4c24e80a206857d4f68198bb027bb4.tar.bz2
crupest-f9aa02ec1a4c24e80a206857d4f68198bb027bb4.zip
HALF WORK: 2024.12.19
Re-organize file structure.
-rw-r--r--.gitignore10
-rw-r--r--.vscode/settings.json3
-rw-r--r--crupest-words.txt52
-rw-r--r--cspell.yaml2
-rw-r--r--docker/blog/Dockerfile (renamed from docker/crupest-blog/Dockerfile)0
-rw-r--r--[-rwxr-xr-x]docker/blog/daemon.bash (renamed from docker/crupest-blog/daemon.bash)0
-rw-r--r--[-rwxr-xr-x]docker/blog/install-hugo.bash (renamed from docker/crupest-blog/install-hugo.bash)0
-rw-r--r--[-rwxr-xr-x]docker/blog/update.bash (renamed from docker/crupest-blog/update.bash)0
-rw-r--r--docker/debian-dev/Dockerfile (renamed from docker/crupest-debian-dev/Dockerfile)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/11/add-deb-src.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/11/add-deb-src.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/11/get-domain.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/11/get-domain.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/11/replace-domain.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/11/replace-domain.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/11/replace-http.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/11/replace-http.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/12/add-deb-src.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/12/add-deb-src.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/12/get-domain.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/12/get-domain.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/12/replace-domain.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/12/replace-domain.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/12/replace-http.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/12/replace-http.bash)0
-rw-r--r--docker/debian-dev/bootstrap/apt-source/china-source.txt (renamed from docker/crupest-debian-dev/bootstrap/apt-source/china-source.txt)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/install-apt-https.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/install-apt-https.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/apt-source/setup.bash (renamed from docker/crupest-debian-dev/bootstrap/apt-source/setup.bash)0
-rw-r--r--docker/debian-dev/bootstrap/bash/bash-completion.bash (renamed from docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash)0
-rw-r--r--docker/debian-dev/bootstrap/bash/code-server.bash (renamed from docker/crupest-debian-dev/bootstrap/bash/code-server.bash)0
-rw-r--r--docker/debian-dev/bootstrap/bash/dquilt.bash (renamed from docker/crupest-debian-dev/bootstrap/bash/dquilt.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/extra/setup-cmake.bash (renamed from docker/crupest-debian-dev/bootstrap/extra/setup-cmake.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/extra/setup-dotnet.bash (renamed from docker/crupest-debian-dev/bootstrap/extra/setup-dotnet.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/extra/setup-llvm.bash (renamed from docker/crupest-debian-dev/bootstrap/extra/setup-llvm.bash)0
-rw-r--r--docker/debian-dev/bootstrap/func.bash (renamed from docker/crupest-debian-dev/bootstrap/func.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/get-debian-version.bash (renamed from docker/crupest-debian-dev/bootstrap/get-debian-version.bash)0
-rw-r--r--docker/debian-dev/bootstrap/home-dot/devscripts (renamed from docker/crupest-debian-dev/bootstrap/home-dot/devscripts)0
-rw-r--r--docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg (renamed from docker/crupest-debian-dev/bootstrap/home-dot/quiltrc-dpkg)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/setup-base.bash (renamed from docker/crupest-debian-dev/bootstrap/setup-base.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/setup-code-server.bash (renamed from docker/crupest-debian-dev/bootstrap/setup-code-server.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/setup-dev.bash (renamed from docker/crupest-debian-dev/bootstrap/setup-dev.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/setup-user.bash (renamed from docker/crupest-debian-dev/bootstrap/setup-user.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/setup.bash (renamed from docker/crupest-debian-dev/bootstrap/setup.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/start/code-server.bash (renamed from docker/crupest-debian-dev/bootstrap/start/code-server.bash)0
-rw-r--r--[-rwxr-xr-x]docker/debian-dev/bootstrap/wait.bash (renamed from docker/crupest-debian-dev/bootstrap/wait.bash)0
-rw-r--r--docker/nginx/Dockerfile (renamed from docker/crupest-nginx/Dockerfile)0
-rw-r--r--docker/nginx/sites/www/.dockerignore (renamed from docker/crupest-nginx/sites/www/.dockerignore)0
-rw-r--r--docker/nginx/sites/www/.gitignore (renamed from docker/crupest-nginx/sites/www/.gitignore)0
-rw-r--r--docker/nginx/sites/www/.proxyrc.json (renamed from docker/crupest-nginx/sites/www/.proxyrc.json)0
-rw-r--r--[-rwxr-xr-x]docker/nginx/sites/www/avatar.png (renamed from docker/crupest-nginx/sites/www/avatar.png)bin12038 -> 12038 bytes
-rw-r--r--docker/nginx/sites/www/favicon.ico (renamed from docker/crupest-nginx/sites/www/favicon.ico)bin15406 -> 15406 bytes
-rw-r--r--docker/nginx/sites/www/index.html (renamed from docker/crupest-nginx/sites/www/index.html)0
-rw-r--r--docker/nginx/sites/www/package.json (renamed from docker/crupest-nginx/sites/www/package.json)0
-rw-r--r--docker/nginx/sites/www/pnpm-lock.yaml (renamed from docker/crupest-nginx/sites/www/pnpm-lock.yaml)0
-rw-r--r--docker/nginx/sites/www/src/main.ts (renamed from docker/crupest-nginx/sites/www/src/main.ts)0
-rw-r--r--docker/nginx/sites/www/src/mock-todos.ts (renamed from docker/crupest-nginx/sites/www/src/mock-todos.ts)0
-rw-r--r--docker/nginx/sites/www/src/style.css (renamed from docker/crupest-nginx/sites/www/src/style.css)0
-rw-r--r--docker/nginx/sites/www/src/todos.ts (renamed from docker/crupest-nginx/sites/www/src/todos.ts)0
-rw-r--r--docker/nginx/sites/www/tsconfig.json (renamed from docker/crupest-nginx/sites/www/tsconfig.json)0
-rw-r--r--docker/v2ray/Dockerfile (renamed from docker/crupest-v2ray/Dockerfile)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/.dockerignore (renamed from docker/crupest-api/CrupestApi/.dockerignore)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/.gitignore (renamed from docker/crupest-api/CrupestApi/.gitignore)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi.sln (renamed from docker/crupest-api/CrupestApi/CrupestApi.sln)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj (renamed from docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi/Program.cs (renamed from docker/crupest-api/CrupestApi/CrupestApi/Program.cs)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json (renamed from docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json)0
-rw-r--r--dropped/docker/crupest-api/CrupestApi/CrupestApi/appsettings.json (renamed from docker/crupest-api/CrupestApi/CrupestApi/appsettings.json)0
-rw-r--r--dropped/docker/crupest-api/Dockerfile (renamed from docker/crupest-api/Dockerfile)0
-rw-r--r--dropped/template/crupest-api-config.json.template (renamed from template/crupest-api-config.json.template)0
-rw-r--r--dropped/template/docker-compose.yaml.template24
-rw-r--r--dropped/template/nginx/timeline.conf.template21
-rw-r--r--dropped/template/v2ray-client-config.json.template (renamed from template/v2ray-client-config.json.template)0
-rw-r--r--template/docker-compose.yaml.template58
-rw-r--r--template/nginx/2fa.conf.template19
-rw-r--r--template/nginx/cert-only.conf.template13
-rw-r--r--template/nginx/code.conf.template22
-rw-r--r--template/nginx/common/acme-challenge3
-rw-r--r--template/nginx/common/https-redirect (renamed from template2/nginx/http/redirect-to-https.segment)0
-rw-r--r--template/nginx/common/proxy-common7
-rw-r--r--template/nginx/git.conf.template22
-rw-r--r--template/nginx/mail.conf.template27
-rw-r--r--template/nginx/redirect.conf.template23
-rw-r--r--template/nginx/reverse-proxy.conf.template32
-rw-r--r--template/nginx/root.conf.template61
-rw-r--r--template/nginx/server.json39
-rw-r--r--template/nginx/server.schema.json93
-rw-r--r--template/nginx/server.ts36
-rw-r--r--template/nginx/static-file.conf.template23
-rw-r--r--template/nginx/timeline.conf.template7
-rw-r--r--template2/nginx/domain.conf.template19
-rw-r--r--template2/nginx/global/client-max-body-size.conf1
-rw-r--r--template2/nginx/global/forbid-unknown-domain.conf8
-rw-r--r--template2/nginx/global/ssl.conf.template17
-rw-r--r--template2/nginx/global/websocket.conf4
-rw-r--r--template2/nginx/http/444.segment3
-rw-r--r--template2/nginx/https/redirect.segment.template7
-rw-r--r--template2/nginx/https/reverse-proxy.segment.template10
-rw-r--r--template2/nginx/https/static-file.no-strip-prefix.segment.template3
-rw-r--r--template2/nginx/https/static-file.segment.template3
-rw-r--r--template2/nginx/server.schema.json96
-rw-r--r--template2/nginx/server.ts66
-rw-r--r--template2/server.json.template58
-rw-r--r--tools/cru-py/.gitignore3
141 files changed, 209 insertions, 686 deletions
diff --git a/.gitignore b/.gitignore
index 649c13b..e1349ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
+/data
+/log
+/tmp
+/backup
+/generated
+
docker-compose.yaml
mailserver.env
crupest-api-config.json
-data
nginx-config
-log
-tmp
-backup
v2ray-config.json
v2ray-client-config.json
forgejo.app.ini.init
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 457f44d..ff2a1bd 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "python.analysis.typeCheckingMode": "basic"
+ "python.analysis.typeCheckingMode": "basic",
+ "dotnet.defaultSolution": "disable"
} \ No newline at end of file
diff --git a/crupest-words.txt b/crupest-words.txt
index f5dd7dc..b0a9936 100644
--- a/crupest-words.txt
+++ b/crupest-words.txt
@@ -1,38 +1,34 @@
-crupest
-
-# software
-forgejo
-sypht
-2fauth
-
+# debian
# secret
-vnext
-vmess
-confdir
-geodata
-geosite
-geoip
-userid
-
+# software
# university
-ustc
-
-# debian
+2fauth
aarch64
-nproc
+buildpackage
chroot
+confdir
cpio
+createchroot
+crupest
+debhelper
+debootstrap
+devscripts
+dquilt
+forgejo
+geodata
+geoip
+geosite
+indep
kmod
-
-buildpackage
nocheck
-indep
-devscripts
-debhelper
+nproc
+quiltrc
+rspamd
sbuild
sbuildrc
schroot
-createchroot
-debootstrap
-quiltrc
-dquilt
+sypht
+userid
+ustc
+vmess
+vnext
diff --git a/cspell.yaml b/cspell.yaml
index 7a1151c..4cc35f7 100644
--- a/cspell.yaml
+++ b/cspell.yaml
@@ -1,6 +1,7 @@
version: "0.2"
language: en
dictionaries:
+ - crupest-words
- en_US
- softwareTerms
- node
@@ -16,7 +17,6 @@ dictionaries:
dictionaryDefinitions:
- name: crupest-words
path: './crupest-words.txt'
- addWords: true
patterns:
- name: libs
diff --git a/docker/crupest-blog/Dockerfile b/docker/blog/Dockerfile
index 7414d4e..7414d4e 100644
--- a/docker/crupest-blog/Dockerfile
+++ b/docker/blog/Dockerfile
diff --git a/docker/crupest-blog/daemon.bash b/docker/blog/daemon.bash
index 561a80a..561a80a 100755..100644
--- a/docker/crupest-blog/daemon.bash
+++ b/docker/blog/daemon.bash
diff --git a/docker/crupest-blog/install-hugo.bash b/docker/blog/install-hugo.bash
index a448138..a448138 100755..100644
--- a/docker/crupest-blog/install-hugo.bash
+++ b/docker/blog/install-hugo.bash
diff --git a/docker/crupest-blog/update.bash b/docker/blog/update.bash
index d4bcadc..d4bcadc 100755..100644
--- a/docker/crupest-blog/update.bash
+++ b/docker/blog/update.bash
diff --git a/docker/crupest-debian-dev/Dockerfile b/docker/debian-dev/Dockerfile
index 95f0602..95f0602 100644
--- a/docker/crupest-debian-dev/Dockerfile
+++ b/docker/debian-dev/Dockerfile
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/11/add-deb-src.bash b/docker/debian-dev/bootstrap/apt-source/11/add-deb-src.bash
index e134a00..e134a00 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/11/add-deb-src.bash
+++ b/docker/debian-dev/bootstrap/apt-source/11/add-deb-src.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/11/get-domain.bash b/docker/debian-dev/bootstrap/apt-source/11/get-domain.bash
index d44ea65..d44ea65 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/11/get-domain.bash
+++ b/docker/debian-dev/bootstrap/apt-source/11/get-domain.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/11/replace-domain.bash b/docker/debian-dev/bootstrap/apt-source/11/replace-domain.bash
index 86e88dc..86e88dc 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/11/replace-domain.bash
+++ b/docker/debian-dev/bootstrap/apt-source/11/replace-domain.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/11/replace-http.bash b/docker/debian-dev/bootstrap/apt-source/11/replace-http.bash
index fae082a..fae082a 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/11/replace-http.bash
+++ b/docker/debian-dev/bootstrap/apt-source/11/replace-http.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/12/add-deb-src.bash b/docker/debian-dev/bootstrap/apt-source/12/add-deb-src.bash
index cf741d6..cf741d6 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/12/add-deb-src.bash
+++ b/docker/debian-dev/bootstrap/apt-source/12/add-deb-src.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/12/get-domain.bash b/docker/debian-dev/bootstrap/apt-source/12/get-domain.bash
index a24538c..a24538c 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/12/get-domain.bash
+++ b/docker/debian-dev/bootstrap/apt-source/12/get-domain.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/12/replace-domain.bash b/docker/debian-dev/bootstrap/apt-source/12/replace-domain.bash
index d55307c..d55307c 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/12/replace-domain.bash
+++ b/docker/debian-dev/bootstrap/apt-source/12/replace-domain.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/12/replace-http.bash b/docker/debian-dev/bootstrap/apt-source/12/replace-http.bash
index ed4391d..ed4391d 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/12/replace-http.bash
+++ b/docker/debian-dev/bootstrap/apt-source/12/replace-http.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/china-source.txt b/docker/debian-dev/bootstrap/apt-source/china-source.txt
index 4312686..4312686 100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/china-source.txt
+++ b/docker/debian-dev/bootstrap/apt-source/china-source.txt
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/install-apt-https.bash b/docker/debian-dev/bootstrap/apt-source/install-apt-https.bash
index 70fb371..70fb371 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/install-apt-https.bash
+++ b/docker/debian-dev/bootstrap/apt-source/install-apt-https.bash
diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash b/docker/debian-dev/bootstrap/apt-source/setup.bash
index cdf68af..cdf68af 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/apt-source/setup.bash
+++ b/docker/debian-dev/bootstrap/apt-source/setup.bash
diff --git a/docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash b/docker/debian-dev/bootstrap/bash/bash-completion.bash
index 75f8333..75f8333 100644
--- a/docker/crupest-debian-dev/bootstrap/bash/bash-completion.bash
+++ b/docker/debian-dev/bootstrap/bash/bash-completion.bash
diff --git a/docker/crupest-debian-dev/bootstrap/bash/code-server.bash b/docker/debian-dev/bootstrap/bash/code-server.bash
index 255c280..255c280 100644
--- a/docker/crupest-debian-dev/bootstrap/bash/code-server.bash
+++ b/docker/debian-dev/bootstrap/bash/code-server.bash
diff --git a/docker/crupest-debian-dev/bootstrap/bash/dquilt.bash b/docker/debian-dev/bootstrap/bash/dquilt.bash
index 96a4eb2..96a4eb2 100644
--- a/docker/crupest-debian-dev/bootstrap/bash/dquilt.bash
+++ b/docker/debian-dev/bootstrap/bash/dquilt.bash
diff --git a/docker/crupest-debian-dev/bootstrap/extra/setup-cmake.bash b/docker/debian-dev/bootstrap/extra/setup-cmake.bash
index 76c1ae4..76c1ae4 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/extra/setup-cmake.bash
+++ b/docker/debian-dev/bootstrap/extra/setup-cmake.bash
diff --git a/docker/crupest-debian-dev/bootstrap/extra/setup-dotnet.bash b/docker/debian-dev/bootstrap/extra/setup-dotnet.bash
index 0ef7743..0ef7743 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/extra/setup-dotnet.bash
+++ b/docker/debian-dev/bootstrap/extra/setup-dotnet.bash
diff --git a/docker/crupest-debian-dev/bootstrap/extra/setup-llvm.bash b/docker/debian-dev/bootstrap/extra/setup-llvm.bash
index 48dde86..48dde86 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/extra/setup-llvm.bash
+++ b/docker/debian-dev/bootstrap/extra/setup-llvm.bash
diff --git a/docker/crupest-debian-dev/bootstrap/func.bash b/docker/debian-dev/bootstrap/func.bash
index 7782035..7782035 100644
--- a/docker/crupest-debian-dev/bootstrap/func.bash
+++ b/docker/debian-dev/bootstrap/func.bash
diff --git a/docker/crupest-debian-dev/bootstrap/get-debian-version.bash b/docker/debian-dev/bootstrap/get-debian-version.bash
index 2cc10b9..2cc10b9 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/get-debian-version.bash
+++ b/docker/debian-dev/bootstrap/get-debian-version.bash
diff --git a/docker/crupest-debian-dev/bootstrap/home-dot/devscripts b/docker/debian-dev/bootstrap/home-dot/devscripts
index a15b041..a15b041 100644
--- a/docker/crupest-debian-dev/bootstrap/home-dot/devscripts
+++ b/docker/debian-dev/bootstrap/home-dot/devscripts
diff --git a/docker/crupest-debian-dev/bootstrap/home-dot/quiltrc-dpkg b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg
index e8fc3c5..e8fc3c5 100644
--- a/docker/crupest-debian-dev/bootstrap/home-dot/quiltrc-dpkg
+++ b/docker/debian-dev/bootstrap/home-dot/quiltrc-dpkg
diff --git a/docker/crupest-debian-dev/bootstrap/setup-base.bash b/docker/debian-dev/bootstrap/setup-base.bash
index 31ded36..31ded36 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/setup-base.bash
+++ b/docker/debian-dev/bootstrap/setup-base.bash
diff --git a/docker/crupest-debian-dev/bootstrap/setup-code-server.bash b/docker/debian-dev/bootstrap/setup-code-server.bash
index 34c9697..34c9697 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/setup-code-server.bash
+++ b/docker/debian-dev/bootstrap/setup-code-server.bash
diff --git a/docker/crupest-debian-dev/bootstrap/setup-dev.bash b/docker/debian-dev/bootstrap/setup-dev.bash
index 92deacb..92deacb 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/setup-dev.bash
+++ b/docker/debian-dev/bootstrap/setup-dev.bash
diff --git a/docker/crupest-debian-dev/bootstrap/setup-user.bash b/docker/debian-dev/bootstrap/setup-user.bash
index f74dcdb..f74dcdb 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/setup-user.bash
+++ b/docker/debian-dev/bootstrap/setup-user.bash
diff --git a/docker/crupest-debian-dev/bootstrap/setup.bash b/docker/debian-dev/bootstrap/setup.bash
index 09b8137..09b8137 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/setup.bash
+++ b/docker/debian-dev/bootstrap/setup.bash
diff --git a/docker/crupest-debian-dev/bootstrap/start/code-server.bash b/docker/debian-dev/bootstrap/start/code-server.bash
index 7dfc0e9..7dfc0e9 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/start/code-server.bash
+++ b/docker/debian-dev/bootstrap/start/code-server.bash
diff --git a/docker/crupest-debian-dev/bootstrap/wait.bash b/docker/debian-dev/bootstrap/wait.bash
index 501c706..501c706 100755..100644
--- a/docker/crupest-debian-dev/bootstrap/wait.bash
+++ b/docker/debian-dev/bootstrap/wait.bash
diff --git a/docker/crupest-nginx/Dockerfile b/docker/nginx/Dockerfile
index 6d0400b..6d0400b 100644
--- a/docker/crupest-nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
diff --git a/docker/crupest-nginx/sites/www/.dockerignore b/docker/nginx/sites/www/.dockerignore
index de4d1f0..de4d1f0 100644
--- a/docker/crupest-nginx/sites/www/.dockerignore
+++ b/docker/nginx/sites/www/.dockerignore
diff --git a/docker/crupest-nginx/sites/www/.gitignore b/docker/nginx/sites/www/.gitignore
index 0b1e50b..0b1e50b 100644
--- a/docker/crupest-nginx/sites/www/.gitignore
+++ b/docker/nginx/sites/www/.gitignore
diff --git a/docker/crupest-nginx/sites/www/.proxyrc.json b/docker/nginx/sites/www/.proxyrc.json
index 8fe13c0..8fe13c0 100644
--- a/docker/crupest-nginx/sites/www/.proxyrc.json
+++ b/docker/nginx/sites/www/.proxyrc.json
diff --git a/docker/crupest-nginx/sites/www/avatar.png b/docker/nginx/sites/www/avatar.png
index d890d8d..d890d8d 100755..100644
--- a/docker/crupest-nginx/sites/www/avatar.png
+++ b/docker/nginx/sites/www/avatar.png
Binary files differ
diff --git a/docker/crupest-nginx/sites/www/favicon.ico b/docker/nginx/sites/www/favicon.ico
index 922a523..922a523 100644
--- a/docker/crupest-nginx/sites/www/favicon.ico
+++ b/docker/nginx/sites/www/favicon.ico
Binary files differ
diff --git a/docker/crupest-nginx/sites/www/index.html b/docker/nginx/sites/www/index.html
index 03485c5..03485c5 100644
--- a/docker/crupest-nginx/sites/www/index.html
+++ b/docker/nginx/sites/www/index.html
diff --git a/docker/crupest-nginx/sites/www/package.json b/docker/nginx/sites/www/package.json
index c42bb29..c42bb29 100644
--- a/docker/crupest-nginx/sites/www/package.json
+++ b/docker/nginx/sites/www/package.json
diff --git a/docker/crupest-nginx/sites/www/pnpm-lock.yaml b/docker/nginx/sites/www/pnpm-lock.yaml
index aa83a70..aa83a70 100644
--- a/docker/crupest-nginx/sites/www/pnpm-lock.yaml
+++ b/docker/nginx/sites/www/pnpm-lock.yaml
diff --git a/docker/crupest-nginx/sites/www/src/main.ts b/docker/nginx/sites/www/src/main.ts
index 2f09deb..2f09deb 100644
--- a/docker/crupest-nginx/sites/www/src/main.ts
+++ b/docker/nginx/sites/www/src/main.ts
diff --git a/docker/crupest-nginx/sites/www/src/mock-todos.ts b/docker/nginx/sites/www/src/mock-todos.ts
index aacb40e..aacb40e 100644
--- a/docker/crupest-nginx/sites/www/src/mock-todos.ts
+++ b/docker/nginx/sites/www/src/mock-todos.ts
diff --git a/docker/crupest-nginx/sites/www/src/style.css b/docker/nginx/sites/www/src/style.css
index 1f9c9ed..1f9c9ed 100644
--- a/docker/crupest-nginx/sites/www/src/style.css
+++ b/docker/nginx/sites/www/src/style.css
diff --git a/docker/crupest-nginx/sites/www/src/todos.ts b/docker/nginx/sites/www/src/todos.ts
index b69f524..b69f524 100644
--- a/docker/crupest-nginx/sites/www/src/todos.ts
+++ b/docker/nginx/sites/www/src/todos.ts
diff --git a/docker/crupest-nginx/sites/www/tsconfig.json b/docker/nginx/sites/www/tsconfig.json
index 9d1434c..9d1434c 100644
--- a/docker/crupest-nginx/sites/www/tsconfig.json
+++ b/docker/nginx/sites/www/tsconfig.json
diff --git a/docker/crupest-v2ray/Dockerfile b/docker/v2ray/Dockerfile
index 003b545..003b545 100644
--- a/docker/crupest-v2ray/Dockerfile
+++ b/docker/v2ray/Dockerfile
diff --git a/docker/crupest-api/CrupestApi/.dockerignore b/dropped/docker/crupest-api/CrupestApi/.dockerignore
index f1c182d..f1c182d 100644
--- a/docker/crupest-api/CrupestApi/.dockerignore
+++ b/dropped/docker/crupest-api/CrupestApi/.dockerignore
diff --git a/docker/crupest-api/CrupestApi/.gitignore b/dropped/docker/crupest-api/CrupestApi/.gitignore
index 371ea59..371ea59 100644
--- a/docker/crupest-api/CrupestApi/.gitignore
+++ b/dropped/docker/crupest-api/CrupestApi/.gitignore
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs
index b9ec03e..b9ec03e 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/ColumnTypeInfoTest.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs
index bd07c70..bd07c70 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudIntegratedTest.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs
index ad0d34c..ad0d34c 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/CrudServiceTest.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs
index 72b6218..72b6218 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/SqlCompareHelper.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs
index b0aa702..b0aa702 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TableInfoTest.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs
index c15334c..c15334c 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Crud/TestEntity.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj
index 0360ee1..0360ee1 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/CrupestApi.Commons.Tests.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs
index 8c927eb..8c927eb 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons.Tests/Usings.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs
index 0ca3547..0ca3547 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Config.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs
index e8d3c2e..e8d3c2e 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnInfo.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs
index 7247ff1..7247ff1 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnMetadata.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs
index 19eff52..19eff52 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ColumnTypeInfo.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs
index 1e881d3..1e881d3 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudService.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs
index a7e5193..a7e5193 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudServiceCollectionExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs
index 8942979..8942979 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/CrudWebApplicationExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs
index 701622c..701622c 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbConnectionFactory.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs
index 5dc5a61..5dc5a61 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/DbNullValue.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs
index cf3f178..cf3f178 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/EntityJsonHelper.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs
index 964a669..964a669 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/IClause.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs
index a880e66..a880e66 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/InsertClause.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs
index f1ae616..f1ae616 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/DatabaseMigrator.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs
index 33310d6..33310d6 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/Migrations/SqliteDatabaseMigrator.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs
index 734d044..734d044 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/OrderByClause.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs
index 37d77ca..37d77ca 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/ParamMap.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md
index b008ea7..b008ea7 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/README.md
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs
index 4a7ea95..4a7ea95 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/TableInfo.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs
index de5c6c3..de5c6c3 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UpdateClause.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs
index 1a10b97..1a10b97 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/UserException.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs
index de69f2f..de69f2f 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Crud/WhereClause.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj
index 8e291fa..8e291fa 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/CrupestApi.Commons.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs
index 0e1f4f4..0e1f4f4 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/EntityNotExistException.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs
index a0b2d89..a0b2d89 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/HttpContextExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs
index 83025f8..83025f8 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/ISecretService.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs
index c3a4de0..c3a4de0 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretInfo.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs
index c693d8d..c693d8d 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretService.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs
index a9c0e5f..a9c0e5f 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretServiceCollectionExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs
index 207cc45..207cc45 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Commons/Secrets/SecretsConstants.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj
index 2221809..2221809 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/CrupestApi.Files.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs
index c851a92..c851a92 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Files/FilesService.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj
index 70c83f3..70c83f3 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/CrupestApi.Secrets.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs
index e09887b..e09887b 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Secrets/SecretsExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj
index 86460e3..86460e3 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/CrupestApi.Todos.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs
index e8160d2..e8160d2 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosConfiguration.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs
index 5839086..5839086 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosService.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs
index a49d55d..a49d55d 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosServiceCollectionExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs
index 0ff05a0..0ff05a0 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.Todos/TodosWebApplicationExtensions.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi.sln b/dropped/docker/crupest-api/CrupestApi/CrupestApi.sln
index ebfd960..ebfd960 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi.sln
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi.sln
diff --git a/docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj b/dropped/docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj
index 5954f00..5954f00 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi/CrupestApi.csproj
diff --git a/docker/crupest-api/CrupestApi/CrupestApi/Program.cs b/dropped/docker/crupest-api/CrupestApi/CrupestApi/Program.cs
index 46648d9..46648d9 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi/Program.cs
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi/Program.cs
diff --git a/docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json b/dropped/docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json
index a4a5cbf..a4a5cbf 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi/Properties/launchSettings.json
diff --git a/docker/crupest-api/CrupestApi/CrupestApi/appsettings.json b/dropped/docker/crupest-api/CrupestApi/CrupestApi/appsettings.json
index 53753bd..53753bd 100644
--- a/docker/crupest-api/CrupestApi/CrupestApi/appsettings.json
+++ b/dropped/docker/crupest-api/CrupestApi/CrupestApi/appsettings.json
diff --git a/docker/crupest-api/Dockerfile b/dropped/docker/crupest-api/Dockerfile
index feb7522..feb7522 100644
--- a/docker/crupest-api/Dockerfile
+++ b/dropped/docker/crupest-api/Dockerfile
diff --git a/template/crupest-api-config.json.template b/dropped/template/crupest-api-config.json.template
index 65a7944..65a7944 100644
--- a/template/crupest-api-config.json.template
+++ b/dropped/template/crupest-api-config.json.template
diff --git a/dropped/template/docker-compose.yaml.template b/dropped/template/docker-compose.yaml.template
new file mode 100644
index 0000000..73ff4e8
--- /dev/null
+++ b/dropped/template/docker-compose.yaml.template
@@ -0,0 +1,24 @@
+services:
+
+ timeline:
+ image: crupest/timeline:latest
+ pull_policy: always
+ container_name: timeline
+ restart: on-failure:3
+ environment:
+ - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
+ - TIMELINE_DisableAutoBackup=true
+ volumes:
+ - ./data/timeline:/root/timeline
+
+ crupest-api:
+ pull_policy: build
+ build:
+ context: ./docker/crupest-api
+ dockerfile: Dockerfile
+ pull: true
+ tags:
+ - "crupest/crupest-api:latest"
+ container_name: crupest-api
+ volumes:
+ - "./crupest-api-config.json:/crupest-api-config.json:ro"
diff --git a/dropped/template/nginx/timeline.conf.template b/dropped/template/nginx/timeline.conf.template
new file mode 100644
index 0000000..551e0ae
--- /dev/null
+++ b/dropped/template/nginx/timeline.conf.template
@@ -0,0 +1,21 @@
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name timeline.${CRUPEST_DOMAIN};
+
+ location / {
+ include common/reverse-proxy;
+ proxy_pass http://timeline:5000/;
+ }
+
+ client_max_body_size 5G;
+}
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name timeline.${CRUPEST_DOMAIN};
+
+ include common/https-redirect;
+ include common/acme-challenge;
+}
diff --git a/template/v2ray-client-config.json.template b/dropped/template/v2ray-client-config.json.template
index 0c99c6d..0c99c6d 100644
--- a/template/v2ray-client-config.json.template
+++ b/dropped/template/v2ray-client-config.json.template
diff --git a/template/docker-compose.yaml.template b/template/docker-compose.yaml.template
index d86aae6..cebdfb3 100644
--- a/template/docker-compose.yaml.template
+++ b/template/docker-compose.yaml.template
@@ -1,38 +1,27 @@
services:
- timeline:
- image: crupest/timeline:latest
- pull_policy: always
- container_name: timeline
- restart: on-failure:3
- environment:
- - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
- - TIMELINE_DisableAutoBackup=true
- volumes:
- - ./data/timeline:/root/timeline
- crupest-blog:
+ blog:
pull_policy: build
build:
- context: ./docker/crupest-blog
+ context: ./docker/blog
dockerfile: Dockerfile
pull: true
tags:
- - "crupest/crupest-blog:latest"
- container_name: crupest-blog
- restart: on-failure:3
+ - "crupest/blog:latest"
+ container_name: blog
volumes:
- "blog-public:/public"
+ restart: on-failure:3
nginx:
pull_policy: build
build:
- context: ./docker/crupest-nginx
+ context: ./docker/nginx
dockerfile: Dockerfile
pull: true
tags:
- - "crupest/crupest-nginx:latest"
+ - "crupest/nginx:latest"
container_name: nginx
- restart: on-failure:3
ports:
- "80:80"
- "443:443"
@@ -41,33 +30,22 @@ services:
- "./nginx-config:/etc/nginx/conf.d:ro"
- "./data/certbot/certs:/etc/letsencrypt:ro"
- "./data/certbot/webroot:/srv/acme:ro"
- - "blog-public:/srv/blog:ro"
-
- crupest-api:
- pull_policy: build
- build:
- context: ./docker/crupest-api
- dockerfile: Dockerfile
- pull: true
- tags:
- - "crupest/crupest-api:latest"
- container_name: crupest-api
- volumes:
- - "./crupest-api-config.json:/crupest-api-config.json:ro"
+ - "blog-public:/srv/www/blog:ro"
+ restart: on-failure:3
v2ray:
pull_policy: build
build:
- context: ./docker/crupest-v2ray
+ context: ./docker/v2ray
dockerfile: Dockerfile
pull: true
tags:
- - "crupest/crupest-v2ray:latest"
- command: [ "run", "-c", "/etc/v2fly/config.json" ]
+ - "crupest/v2ray:latest"
container_name: v2ray
- restart: on-failure:3
+ command: [ "run", "-c", "/etc/v2fly/config.json" ]
volumes:
- "./v2ray-config.json:/etc/v2fly/config.json:ro"
+ restart: on-failure:3
auto-certbot:
pull_policy: build
@@ -148,7 +126,7 @@ services:
debian-dev:
pull_policy: build
build:
- context: ./docker/crupest-debian-dev
+ context: ./docker/debian-dev
dockerfile: Dockerfile
pull: true
args:
@@ -158,16 +136,15 @@ services:
container_name: debian-dev
init: true
command: [ "/bootstrap/start/code-server.bash" ]
- restart: on-failure:3
volumes:
- ./data/debian-dev:/data
- debian-dev-home:/home/crupest
+ restart: on-failure:3
forgejo:
image: code.forgejo.org/forgejo/forgejo:9
pull_policy: always
container_name: forgejo
- restart: on-failure:3
environment:
- USER_UID=1000
- USER_GID=1000
@@ -175,11 +152,11 @@ services:
- ./data/forgejo:/data
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
+ restart: on-failure:3
roundcubemail:
image: roundcube/roundcubemail:latest
container_name: roundcubemail
- restart: on-failure:3
volumes:
- ./data/secret/gnupg:/gnupg
- ./data/roundcube/www/html:/var/www/html
@@ -193,6 +170,7 @@ services:
- ROUNDCUBEMAIL_SMTP_PORT=465
- ROUNDCUBEMAIL_DB_TYPE=sqlite
- ROUNDCUBEMAIL_PLUGINS=archive,enigma,jqueryui,newmail_notifier,show_additional_headers,userinfo,zipdownload
+ restart: on-failure:3
2fauth:
image: 2fauth/2fauth
@@ -218,4 +196,4 @@ services:
volumes:
blog-public:
debian-dev-home:
- roundcubemail-temp: \ No newline at end of file
+ roundcubemail-temp:
diff --git a/template/nginx/2fa.conf.template b/template/nginx/2fa.conf.template
new file mode 100644
index 0000000..aad66c1
--- /dev/null
+++ b/template/nginx/2fa.conf.template
@@ -0,0 +1,19 @@
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name 2fa.${CRUPEST_DOMAIN};
+
+ location / {
+ include common/proxy-common;
+ proxy_pass http://2fauth:8000/;
+ }
+}
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name 2fa.${CRUPEST_DOMAIN};
+
+ include common/https-redirect;
+ include common/acme-challenge;
+}
diff --git a/template/nginx/cert-only.conf.template b/template/nginx/cert-only.conf.template
deleted file mode 100644
index 08daa8a..0000000
--- a/template/nginx/cert-only.conf.template
+++ /dev/null
@@ -1,13 +0,0 @@
-server {
- listen 80;
- listen [::]:80;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- return 444;
- }
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
diff --git a/template/nginx/code.conf.template b/template/nginx/code.conf.template
new file mode 100644
index 0000000..a67500d
--- /dev/null
+++ b/template/nginx/code.conf.template
@@ -0,0 +1,22 @@
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name code.${CRUPEST_DOMAIN};
+
+ location / {
+ include common/proxy-common;
+ proxy_pass http://debian-dev:8080/;
+ }
+
+ client_max_body_size 5G;
+}
+
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name code.${CRUPEST_DOMAIN};
+
+ include common/https-redirect;
+ include common/acme-challenge;
+}
diff --git a/template/nginx/common/acme-challenge b/template/nginx/common/acme-challenge
new file mode 100644
index 0000000..26054b8
--- /dev/null
+++ b/template/nginx/common/acme-challenge
@@ -0,0 +1,3 @@
+location /.well-known/acme-challenge {
+ root /srv/acme;
+}
diff --git a/template2/nginx/http/redirect-to-https.segment b/template/nginx/common/https-redirect
index 56d095d..56d095d 100644
--- a/template2/nginx/http/redirect-to-https.segment
+++ b/template/nginx/common/https-redirect
diff --git a/template/nginx/common/proxy-common b/template/nginx/common/proxy-common
new file mode 100644
index 0000000..4193548
--- /dev/null
+++ b/template/nginx/common/proxy-common
@@ -0,0 +1,7 @@
+proxy_http_version 1.1;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header Host $host;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-Real-IP $remote_addr;
diff --git a/template/nginx/git.conf.template b/template/nginx/git.conf.template
new file mode 100644
index 0000000..ea2a627
--- /dev/null
+++ b/template/nginx/git.conf.template
@@ -0,0 +1,22 @@
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name git.${CRUPEST_DOMAIN};
+
+ location / {
+ include common/proxy-common;
+ proxy_pass http://forgejo:3000/;
+ }
+
+ client_max_body_size 5G;
+}
+
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name git.${CRUPEST_DOMAIN};
+
+ include common/https-redirect;
+ include common/acme-challenge;
+}
diff --git a/template/nginx/mail.conf.template b/template/nginx/mail.conf.template
new file mode 100644
index 0000000..ba2e44e
--- /dev/null
+++ b/template/nginx/mail.conf.template
@@ -0,0 +1,27 @@
+server {
+ listen 443 ssl http2;
+ listen [::]:443 ssl http2;
+ server_name mail.${CRUPEST_DOMAIN};
+
+ location / {
+ include common/proxy-common;
+ proxy_pass http://roundcubemail:80/;
+ }
+
+ location /rspamd/ {
+ include common/proxy-common;
+ proxy_pass http://mailserver:11334/;
+ }
+
+ client_max_body_size 5G;
+}
+
+
+server {
+ listen 80;
+ listen [::]:80;
+ server_name mail.${CRUPEST_DOMAIN};
+
+ include common/https-redirect;
+ include common/acme-challenge;
+}
diff --git a/template/nginx/redirect.conf.template b/template/nginx/redirect.conf.template
deleted file mode 100644
index b3122e2..0000000
--- a/template/nginx/redirect.conf.template
+++ /dev/null
@@ -1,23 +0,0 @@
-server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- return 301 ${CRUPEST_NGINX_URL}$request_uri;
- }
-}
-
-server {
- listen 80;
- listen [::]:80;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- return 301 ${CRUPEST_NGINX_URL}$request_uri;
- }
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
diff --git a/template/nginx/reverse-proxy.conf.template b/template/nginx/reverse-proxy.conf.template
deleted file mode 100644
index 01442ab..0000000
--- a/template/nginx/reverse-proxy.conf.template
+++ /dev/null
@@ -1,32 +0,0 @@
-server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://${CRUPEST_NGINX_UPSTREAM_SERVER};
- }
-
- client_max_body_size 5G;
-}
-
-server {
- listen 80;
- listen [::]:80;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
diff --git a/template/nginx/root.conf.template b/template/nginx/root.conf.template
index 21d144c..3f20cf1 100644
--- a/template/nginx/root.conf.template
+++ b/template/nginx/root.conf.template
@@ -13,27 +13,9 @@ server {
}
proxy_redirect off;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
+ include common/proxy-common;
proxy_pass http://v2ray:10000;
}
-
- location /api {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://crupest-api:5000;
- }
-
}
server {
@@ -41,43 +23,6 @@ server {
listen [::]:80;
server_name ${CRUPEST_DOMAIN};
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
-
-# For mail temporarily
-# TODO: Make subpath supported in aio.
-server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name mail.${CRUPEST_DOMAIN};
-
- location / {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://roundcubemail:80/;
- }
-
- location /rspamd/ {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://mailserver:11334/;
- }
-
- client_max_body_size 5G;
+ include common/https-redirect;
+ include common/acme-challenge;
}
diff --git a/template/nginx/server.json b/template/nginx/server.json
deleted file mode 100644
index fa84030..0000000
--- a/template/nginx/server.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "$schema": "./server.schema.json",
- "sites": [
- {
- "type": "reverse-proxy",
- "subdomain": "timeline",
- "upstream": "timeline:5000"
- },
- {
- "type": "reverse-proxy",
- "subdomain": "code",
- "upstream": "debian-dev:8080"
- },
- {
- "type": "reverse-proxy",
- "subdomain": "git",
- "upstream": "forgejo:3000"
- },
- {
- "type": "cert-only",
- "subdomain": "mail"
- },
- {
- "type": "reverse-proxy",
- "subdomain": "2fa",
- "upstream": "2fauth:8000"
- },
- {
- "type": "static-file",
- "subdomain": "blog",
- "root": "/srv/blog"
- },
- {
- "type": "redirect",
- "subdomain": "github",
- "url": "https://github.com/crupest"
- }
- ]
-}
diff --git a/template/nginx/server.schema.json b/template/nginx/server.schema.json
deleted file mode 100644
index c3bc7c0..0000000
--- a/template/nginx/server.schema.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "definitions": {
- "CertOnlySite": {
- "properties": {
- "subdomain": {
- "type": "string"
- },
- "type": {
- "enum": [
- "cert-only"
- ],
- "type": "string"
- }
- },
- "type": "object"
- },
- "RedirectSite": {
- "properties": {
- "subdomain": {
- "type": "string"
- },
- "type": {
- "enum": [
- "redirect"
- ],
- "type": "string"
- },
- "url": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "ReverseProxySite": {
- "properties": {
- "subdomain": {
- "type": "string"
- },
- "type": {
- "enum": [
- "reverse-proxy"
- ],
- "type": "string"
- },
- "upstream": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "StaticFileSite": {
- "properties": {
- "root": {
- "type": "string"
- },
- "subdomain": {
- "type": "string"
- },
- "type": {
- "enum": [
- "static-file"
- ],
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "properties": {
- "sites": {
- "items": {
- "anyOf": [
- {
- "$ref": "#/definitions/ReverseProxySite"
- },
- {
- "$ref": "#/definitions/StaticFileSite"
- },
- {
- "$ref": "#/definitions/RedirectSite"
- },
- {
- "$ref": "#/definitions/CertOnlySite"
- }
- ]
- },
- "type": "array"
- }
- },
- "type": "object"
-}
-
diff --git a/template/nginx/server.ts b/template/nginx/server.ts
deleted file mode 100644
index 368e5ff..0000000
--- a/template/nginx/server.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Used to generate json schema.
-
-export interface ReverseProxySite {
- type: "reverse-proxy";
- subdomain: string;
- upstream: string;
-}
-
-export interface StaticFileSite {
- type: "static-file";
- subdomain: string;
- root: string;
-}
-
-export interface RedirectSite {
- type: "redirect";
- subdomain: string;
- url: string;
-}
-
-export interface CertOnlySite {
- type: "cert-only";
- subdomain: string;
-}
-
-export type Site =
- | ReverseProxySite
- | StaticFileSite
- | RedirectSite
- | CertOnlySite;
-
-export type Sites = Site[];
-
-export interface Server {
- sites: Sites;
-}
diff --git a/template/nginx/static-file.conf.template b/template/nginx/static-file.conf.template
deleted file mode 100644
index 3022886..0000000
--- a/template/nginx/static-file.conf.template
+++ /dev/null
@@ -1,23 +0,0 @@
-server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- root ${CRUPEST_NGINX_ROOT};
- }
-}
-
-server {
- listen 80;
- listen [::]:80;
- server_name ${CRUPEST_NGINX_SUBDOMAIN}.${CRUPEST_DOMAIN};
-
- location / {
- return 301 https://$host$request_uri;
- }
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
diff --git a/template/nginx/timeline.conf.template b/template/nginx/timeline.conf.template
new file mode 100644
index 0000000..db908e8
--- /dev/null
+++ b/template/nginx/timeline.conf.template
@@ -0,0 +1,7 @@
+server {
+ listen 80;
+ listen [::]:80;
+ server_name timeline.${CRUPEST_DOMAIN};
+
+ include common/acme-challenge;
+}
diff --git a/template2/nginx/domain.conf.template b/template2/nginx/domain.conf.template
deleted file mode 100644
index 7fa2d7a..0000000
--- a/template2/nginx/domain.conf.template
+++ /dev/null
@@ -1,19 +0,0 @@
-server {
- listen 443 ssl http2;
- listen [::]:443 ssl http2;
- server_name ${DOMAIN};
-
-${HTTPS_SEGMENT}
-}
-
-server {
- listen 80;
- listen [::]:80;
- server_name ${DOMAIN};
-
-${HTTP_SEGMENT}
-
- location /.well-known/acme-challenge {
- root /srv/acme;
- }
-}
diff --git a/template2/nginx/global/client-max-body-size.conf b/template2/nginx/global/client-max-body-size.conf
deleted file mode 100644
index a2b1c00..0000000
--- a/template2/nginx/global/client-max-body-size.conf
+++ /dev/null
@@ -1 +0,0 @@
-client_max_body_size 5G;
diff --git a/template2/nginx/global/forbid-unknown-domain.conf b/template2/nginx/global/forbid-unknown-domain.conf
deleted file mode 100644
index ae96393..0000000
--- a/template2/nginx/global/forbid-unknown-domain.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-server {
- listen 80 default_server;
- listen [::]:80 default_server;
- listen 443 ssl http2 default_server;
- listen [::]:443 ssl http2 default_server;
-
- return 444;
-}
diff --git a/template2/nginx/global/ssl.conf.template b/template2/nginx/global/ssl.conf.template
deleted file mode 100644
index ff70f5a..0000000
--- a/template2/nginx/global/ssl.conf.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file contains important security parameters. If you modify this file
-# manually, Certbot will be unable to automatically provide future security
-# updates. Instead, Certbot will print and log an error message with a path to
-# the up-to-date file that you will need to refer to when manually updating
-# this file. Contents are based on https://ssl-config.mozilla.org
-
-ssl_certificate /etc/letsencrypt/live/${ROOT_DOMAIN}/fullchain.pem;
-ssl_certificate_key /etc/letsencrypt/live/${ROOT_DOMAIN}/privkey.pem;
-
-ssl_session_cache shared:le_nginx_SSL:10m;
-ssl_session_timeout 1440m;
-ssl_session_tickets off;
-
-ssl_protocols TLSv1.2 TLSv1.3;
-ssl_prefer_server_ciphers off;
-
-ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384";
diff --git a/template2/nginx/global/websocket.conf b/template2/nginx/global/websocket.conf
deleted file mode 100644
index 32af4c3..0000000
--- a/template2/nginx/global/websocket.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
-}
diff --git a/template2/nginx/http/444.segment b/template2/nginx/http/444.segment
deleted file mode 100644
index fe490d4..0000000
--- a/template2/nginx/http/444.segment
+++ /dev/null
@@ -1,3 +0,0 @@
-location / {
- return 444;
-}
diff --git a/template2/nginx/https/redirect.segment.template b/template2/nginx/https/redirect.segment.template
deleted file mode 100644
index 028f617..0000000
--- a/template2/nginx/https/redirect.segment.template
+++ /dev/null
@@ -1,7 +0,0 @@
-location = ${PATH} {
- return ${REDIRECT_CODE} ${REDIRECT_URL};
-}
-
-location ^${PATH}/(?<redirect_path>.*)$ {
- return ${REDIRECT_CODE} ${REDIRECT_URL}/$redirect_path;
-}
diff --git a/template2/nginx/https/reverse-proxy.segment.template b/template2/nginx/https/reverse-proxy.segment.template
deleted file mode 100644
index 85a942e..0000000
--- a/template2/nginx/https/reverse-proxy.segment.template
+++ /dev/null
@@ -1,10 +0,0 @@
-location ${PATH}/ {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_pass http://${UPSTREAM};
-}
diff --git a/template2/nginx/https/static-file.no-strip-prefix.segment.template b/template2/nginx/https/static-file.no-strip-prefix.segment.template
deleted file mode 100644
index 4e829ba..0000000
--- a/template2/nginx/https/static-file.no-strip-prefix.segment.template
+++ /dev/null
@@ -1,3 +0,0 @@
-location ${PATH}/ {
- root ${ROOT};
-}
diff --git a/template2/nginx/https/static-file.segment.template b/template2/nginx/https/static-file.segment.template
deleted file mode 100644
index 683cad3..0000000
--- a/template2/nginx/https/static-file.segment.template
+++ /dev/null
@@ -1,3 +0,0 @@
-location ${PATH}/ {
- alias ${ROOT};
-}
diff --git a/template2/nginx/server.schema.json b/template2/nginx/server.schema.json
deleted file mode 100644
index a19c131..0000000
--- a/template2/nginx/server.schema.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-07/schema#",
- "definitions": {
- "RedirectService": {
- "properties": {
- "code": {
- "type": "number"
- },
- "path": {
- "type": "string"
- },
- "to": {
- "type": "string"
- },
- "type": {
- "enum": [
- "redirect"
- ],
- "type": "string"
- }
- },
- "type": "object"
- },
- "ReverseProxyService": {
- "properties": {
- "path": {
- "type": "string"
- },
- "type": {
- "enum": [
- "reverse-proxy"
- ],
- "type": "string"
- },
- "upstream": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "StaticFileService": {
- "properties": {
- "no_strip_prefix": {
- "type": "boolean"
- },
- "path": {
- "type": "string"
- },
- "root": {
- "type": "string"
- },
- "type": {
- "enum": [
- "static-file"
- ],
- "type": "string"
- }
- },
- "type": "object"
- },
- "SubDomain": {
- "properties": {
- "name": {
- "type": "string"
- },
- "services": {
- "items": {
- "anyOf": [
- {
- "$ref": "#/definitions/RedirectService"
- },
- {
- "$ref": "#/definitions/StaticFileService"
- },
- {
- "$ref": "#/definitions/ReverseProxyService"
- }
- ]
- },
- "type": "array"
- }
- },
- "type": "object"
- }
- },
- "properties": {
- "domains": {
- "items": {
- "$ref": "#/definitions/SubDomain"
- },
- "type": "array"
- }
- },
- "type": "object"
-}
-
diff --git a/template2/nginx/server.ts b/template2/nginx/server.ts
deleted file mode 100644
index ffd64b7..0000000
--- a/template2/nginx/server.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// Used to generate json schema.
-
-// path should start with "/", end without "/" and contain no special characters in regex.
-// the special case is root path "/", which is allowed.
-
-// For example:
-// Given
-// path: /a/b
-// to: http://c.com/d
-// Then (no_strip_prefix is false)
-// url: /a/b/c
-// redirect to: http://c.com/d/c (/a/b is removed)
-// Note:
-// Contrary to reverse proxy, you would always want to strip the prefix path.
-// Because there is no meaning to redirect to the new page with the original path.
-// If you want a domain-only redirect, just specify the path as "/".
-export interface RedirectService {
- type: "redirect";
- path: string; // must be a path, should start with "/", end without "/"
- to: string; // must be a url, should start with scheme (http:// or https://), end without "/"
- code?: number; // default to 307
-}
-
-// For example:
-// Given
-// path: /a/b
-// root: /e/f
-// Then (no_strip_prefix is false)
-// url: /a/b/c/d
-// file path: /e/f/c/d (/a/b is removed)
-// Or (no_strip_prefix is true)
-// url: /a/b/c/d
-// file path: /e/f/a/b/c/d
-export interface StaticFileService {
- type: "static-file";
- path: string; // must be a path, should start with "/", end without "/"
- root: string; // must be a path (directory), should start with "/", end without "/"
- no_strip_prefix?: boolean; // default to false. If true, the path prefix is not removed from the url when finding the file.
-}
-
-// For example:
-// Given
-// path: /a/b
-// upstream: another-server:1234
-// Then
-// url: /a/b/c/d
-// proxy to: another-server:1234/a/b/c/d
-// Note:
-// Contrary to redirect, you would always want to keep the prefix path.
-// Because the upstream server will mess up the path handling if the prefix is not kept.
-export interface ReverseProxyService {
- type: "reverse-proxy";
- path: string; // must be a path, should start with "/", end without "/"
- upstream: string; // should be a [host]:[port], like "localhost:1234"
-}
-
-export type Service = RedirectService | StaticFileService | ReverseProxyService;
-
-export interface SubDomain {
- name: string; // @ for root domain
- services: Service[];
-}
-
-export interface Server {
- domains: SubDomain[];
-}
diff --git a/template2/server.json.template b/template2/server.json.template
deleted file mode 100644
index 22f1251..0000000
--- a/template2/server.json.template
+++ /dev/null
@@ -1,58 +0,0 @@
-{
- "$schema": "./server.schema.json",
- "domains": [
- {
- "name": "@",
- "services": [
- {
- "type": "static-file",
- "path": "/",
- "root": "/srv/www"
- },
- {
- "type": "redirect",
- "path": "/github",
- "to": "https://github.com/crupest"
- },
- {
- "type": "reverse-proxy",
- "path": "/_${V2RAY_PATH}",
- "upstream": "crupest-v2ray:10000"
- }
- ]
- },
- {
- "name": "code",
- "services": [
- {
- "type": "reverse-proxy",
- "path": "/",
- "upstream": "code-server:8080"
- }
- ]
- },
- {
- "name": "timeline",
- "services": [
- {
- "type": "reverse-proxy",
- "path": "/",
- "upstream": "timeline:5000"
- }
- ]
- },
- {
- "name": "blog",
- "services": [
- {
- "type": "static-file",
- "path": "/",
- "root": "/srv/blog"
- }
- ]
- },
- {
- "name": "mail"
- }
- ]
-} \ No newline at end of file
diff --git a/tools/cru-py/.gitignore b/tools/cru-py/.gitignore
index 259058c..d40cb9b 100644
--- a/tools/cru-py/.gitignore
+++ b/tools/cru-py/.gitignore
@@ -2,3 +2,6 @@
venv
__pycache__
+
+.continuerc.json
+.continuerules