diff --git a/README.en.md b/README.en.md index bd2bb8b..adaadf0 100644 --- a/README.en.md +++ b/README.en.md @@ -1,6 +1,6 @@ # Bonsai -A family wiki and photoalbum engine (in Russian). +A family wiki and photoalbum engine. ### [Live demo](https://bonsai.kirillorlov.pro) @@ -30,7 +30,12 @@ A family wiki and photoalbum engine (in Russian). ## Installation via Docker 1. Download the [docker-compose.lite.yml](docker-compose.lite.yml). -2. _Optional_: +2. Set the locale to English: + + Modify `docker-compose.lite.yml`: + Change `Locale=ru-RU` to `Locale=en-US`. + +3. _Optional_: Configure your Bonsai instance to use HTTPS for better security. @@ -38,20 +43,20 @@ A family wiki and photoalbum engine (in Russian). This requires a bit of work, so if you just want to give Bonsai a quick spin - feel free to skip or postpone this one and the next. -3. _Optional_: +4. _Optional_: Create a [Google Authorization app](https://docs.microsoft.com/en-us/aspnet/core/security/authentication/social/google-logins?view=aspnetcore-6.0) (or Yandex / VK.com). Modify `docker-compose.lite.yml`: * Save Google authorization credentials to `Auth__Google__ClientId` and `Auth__Google__ClientSecret` config properties - * Set `Auth__AllowPasswordAuth=false` if you want to disable the less-secure password authorization + * Set `Auth__AllowPasswordAuth=false` if you want to disable the less-secure password authorization -4. Bring everything up using `docker compose`: +5. Bring everything up using `docker compose`: ``` docker-compose -f docker-compose.lite.yml up -d ``` -5. After everything is brought up Bonsai will listen on port `8080`. +6. After everything is brought up Bonsai will listen on port `8080`. ## Development (on Windows) diff --git a/README.md b/README.md index f480b25..9195b66 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Bonsai -Фамильный вики-движок и фотоальбом. +Фамильный вики-движок и фотоальбом на нескольких языках. ### [Демо: попробовать в действии](https://bonsai.kirillorlov.pro) @@ -49,11 +49,16 @@ * Впишите данные для авторизации Google в поля `Auth__Google__ClientId` и `Auth__Google__ClientSecret` * Задайте настройку `Auth__AllowPasswordAuth=false`, если хотите отключить менее безопасную авторизацию по паролю -4. Запустите все контейнеры с помощью `docker compose`: +4. _Опционально_: + + Если вы хотите запустить Bonsai на языке, отличном от русского, поменяйте локаль в `docker-compose.lite.yml`: + Вместо `Locale=ru-RU` можно использовать `en-US`. + +5. Запустите все контейнеры с помощью `docker compose`: ``` docker-compose -f docker-compose.lite.yml up -d ``` -5. После старта Bonsai будет доступен на порту `8080`. +6. После старта Bonsai будет доступен на порту `8080`. ## Разработка (на Windows) diff --git a/docker-compose.lite.yml b/docker-compose.lite.yml index cf781f4..d6c91e5 100644 --- a/docker-compose.lite.yml +++ b/docker-compose.lite.yml @@ -12,6 +12,7 @@ services: - ConnectionStrings__Database= - ConnectionStrings__EmbeddedDatabase=Data Source=/app/App_Data/bonsai.db - ConnectionStrings__UseEmbeddedDatabase=true + - Locale=ru-RU - Auth__AllowPasswordAuth=true - ASPNETCORE_ENVIRONMENT=Production stop_signal: SIGKILL diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 2e6b9c6..1a33a8c 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -10,6 +10,7 @@ services: environment: - ConnectionStrings__Database=Server=postgres;Port=5432;Database=bonsai;User Id=bonsai;Password=test;Persist Security Info=true - Auth__AllowPasswordAuth=true + - Locale=ru-RU - ASPNETCORE_ENVIRONMENT=Production stop_signal: SIGKILL links: diff --git a/docker-compose.yml b/docker-compose.yml index 9f54097..9942c2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,6 +39,7 @@ services: - images:/app/wwwroot/media environment: - ConnectionStrings__Database=Server=postgres;Port=5432;Database=bonsai;User Id=bonsai;Password=test;Persist Security Info=true + - Locale=ru-RU - Auth__AllowPasswordAuth=true - Auth__Google__ClientId= - Auth__Google__ClientSecret=