From baeb0856d1d39d8083c9c8a4d2657c7a6e2bc605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 5 Aug 2022 17:27:46 +0200 Subject: [PATCH] Testing (#81) * 22.06 * Auto-update README * Update manifest.json * Fix * 22.06.1 * Auto-update README * Update upgrade * 22.06.2 * Auto-update README * Update app.src * Update DESCRIPTION.md * Auto-update README * Update nginx.conf * Update .env.example.complete * Update .env.example.complete * Update install * Revert "Update install" This reverts commit e43db7a0deb773ce8e4514887383b7528cc63808. * 22.07.1 (#80) * 22.07.1 * Auto-update README Co-authored-by: yunohost-bot * Auto-update README Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/.env.example.complete | 46 +++++++++++++++++++++----------------- conf/app.src | 4 ++-- conf/nginx.conf | 2 +- manifest.json | 2 +- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index a20f225..bcc743a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 22.06.2~ynh1 +**Shipped version:** 22.07.1~ynh1 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 1a07e3c..9729d2b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Multi-Lingual -**Version incluse :** 22.06.2~ynh1 +**Version incluse :** 22.07.1~ynh1 **Démo :** https://demo.bookstackapp.com diff --git a/conf/.env.example.complete b/conf/.env.example.complete index fb94740..600c957 100644 --- a/conf/.env.example.complete +++ b/conf/.env.example.complete @@ -20,12 +20,12 @@ APP_KEY=SomeRandomString # Application URL # This must be the root URL that you want to host BookStack on. # All URL's in BookStack will be generated using this value. -APP_URL=https://example.com +APP_URL=__APP_URL_DOMAIN__ # Application default language # The default language choice to show. # May be overridden by user-preference or visitor browser settings. -APP_LANG=en +APP_LANG=__LANGUAGE__ # Auto-detect language for public visitors. # Uses browser-sent headers to infer a language. @@ -35,7 +35,7 @@ APP_AUTO_LANG_PUBLIC=true # Application timezone # Used where dates are displayed such as on exported content. # Valid timezone values can be found here: https://www.php.net/manual/en/timezones.php -APP_TIMEZONE=UTC +APP_TIMEZONE=__TIMEZONE__ # Application theme # Used to specific a themes/ folder where BookStack UI @@ -54,9 +54,9 @@ APP_PROXIES=null # Host can contain a port (localhost:3306) or a separate DB_PORT option can be used. DB_HOST=localhost DB_PORT=3306 -DB_DATABASE=database_database -DB_USERNAME=database_username -DB_PASSWORD=database_user_password +DB_DATABASE=__DB_NAME__ +DB_USERNAME=__DB_USER__ +DB_PASSWORD=__DB_PWD__ # MySQL specific connection options # Path to Certificate Authority (CA) certificate file for your MySQL instance. @@ -70,20 +70,20 @@ MYSQL_ATTR_SSL_CA="/path/to/ca.pem" MAIL_DRIVER=smtp # Mail sending options -MAIL_FROM=mail@bookstackapp.com +MAIL_FROM=bookstack@__DOMAIN__ MAIL_FROM_NAME=BookStack # SMTP mail options MAIL_HOST=localhost -MAIL_PORT=1025 -MAIL_USERNAME=null -MAIL_PASSWORD=null +MAIL_PORT=25 +MAIL_USERNAME=bookstack +MAIL_PASSWORD=__MAIL_PWD__ MAIL_ENCRYPTION=null # Cache & Session driver to use # Can be 'file', 'database', 'memcached' or 'redis' -CACHE_DRIVER=file -SESSION_DRIVER=file +CACHE_DRIVER=redis +SESSION_DRIVER=redis # Session configuration SESSION_LIFETIME=120 @@ -104,7 +104,7 @@ MEMCACHED_SERVERS=127.0.0.1:11211:100 # This follows the following format: HOST:PORT:DATABASE # or, if using a password: HOST:PORT:DATABASE:PASSWORD # For multiple servers separate with a comma. These will be clustered. -REDIS_SERVERS=127.0.0.1:6379:0 +REDIS_SERVERS=127.0.0.1:6379:__REDIS_DB__ # Queue driver to use # Can be 'sync', 'database' or 'redis' @@ -143,6 +143,10 @@ STORAGE_URL=false # Can be 'standard', 'ldap', 'saml2' or 'oidc' AUTH_METHOD=standard +# Automatically initiate login via external auth system if it's the only auth method. +# Works with saml2 or oidc auth methods. +AUTH_AUTO_INITIATE=false + # Social authentication configuration # All disabled by default. # Refer to https://www.bookstackapp.com/docs/admin/third-party-auth/ @@ -201,20 +205,21 @@ TWITTER_APP_SECRET=false TWITTER_AUTO_REGISTER=false TWITTER_AUTO_CONFIRM_EMAIL=false +# General auth +AUTH_METHOD=__AUTH_METHOD__ + # LDAP authentication configuration # Refer to https://www.bookstackapp.com/docs/admin/ldap-auth/ -LDAP_SERVER=false -LDAP_BASE_DN=false +LDAP_SERVER=ldap://127.0.0.1:389 +LDAP_BASE_DN=ou=users,dc=yunohost,dc=org LDAP_DN=false LDAP_PASS=false -LDAP_USER_FILTER=false -LDAP_VERSION=false -LDAP_START_TLS=false +LDAP_USER_FILTER=(&(uid=${user})) +LDAP_VERSION=3 LDAP_TLS_INSECURE=false LDAP_ID_ATTRIBUTE=uid LDAP_EMAIL_ATTRIBUTE=mail LDAP_DISPLAY_NAME_ATTRIBUTE=cn -LDAP_THUMBNAIL_ATTRIBUTE=null LDAP_FOLLOW_REFERRALS=true LDAP_DUMP_USER_DETAILS=false @@ -223,6 +228,7 @@ LDAP_DUMP_USER_DETAILS=false LDAP_USER_TO_GROUPS=false LDAP_GROUP_ATTRIBUTE="memberOf" LDAP_REMOVE_FROM_GROUPS=false +LDAP_DUMP_USER_GROUPS=false # SAML authentication configuration # Refer to https://www.bookstackapp.com/docs/admin/saml2-auth/ @@ -273,7 +279,7 @@ AVATAR_URL= # Enable diagrams.net integration # Can simply be true/false to enable/disable the integration. # Alternatively, It can be URL to the diagrams.net instance you want to use. -# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1 +# For URLs, The following URL parameters should be included: embed=1&proto=json&spin=1&configure=1 DRAWIO=true # Default item listing view diff --git a/conf/app.src b/conf/app.src index 7f20a48..e3e1665 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.06.2.tar.gz -SOURCE_SUM=b64c41e4ebb9cb46a54915b9dbc090620466372ab5919ddcb58ae5595730f09e +SOURCE_URL=https://github.com/BookStackApp/BookStack/archive/refs/tags/v22.07.1.tar.gz +SOURCE_SUM=242a75303612961efce381be5481e36f1cc07e4ef700dd72e865f35253eb5beb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index f8d8ba4..3672207 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,7 @@ location __PATH__/ { # Path to source alias __FINALPATH__/public/; - client_max_body_size 100M; + client_max_body_size 100m; client_body_timeout 120s; # Default is 60, May need to be increased for very large uploads index index.php; diff --git a/manifest.json b/manifest.json index 94b6a72..0881276 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Platform to create documentation/wiki content", "fr": "Plateforme pour créer du contenu de documentation/wiki" }, - "version": "22.06.2~ynh1", + "version": "22.07.1~ynh1", "url": "https://www.bookstackapp.com/", "upstream": { "license": "MIT",