From 42261bd089d7c7768a2b255d77cf06530ad4bb90 Mon Sep 17 00:00:00 2001 From: anmol Date: Fri, 2 Nov 2018 19:23:01 +0530 Subject: [PATCH] Updated to version 4.7.8 --- README.md | 2 +- conf/.env | 89 ++++++++++++++++++++++++++++++++++++++++++--------- conf/app.src | 4 +-- manifest.json | 2 +- 4 files changed, 78 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 80f616b..709dd07 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

-# Firefly III v4.7.7 for YunoHost +# Firefly III v4.7.8 for YunoHost [![Integration level](https://dash.yunohost.org/integration/Firefly-III.svg)](https://ci-apps.yunohost.org/jenkins/job/firefly-iii%20%28Community%29/lastBuild/consoleFull) diff --git a/conf/.env b/conf/.env index 7033dc4..d8cdf12 100644 --- a/conf/.env +++ b/conf/.env @@ -17,22 +17,14 @@ APP_KEY=random_key # Example: Europe/Amsterdam TZ=UTC -# APP_URL and TRUSTED_PROXIES are useful when using Docker and/or a reverse proxy. +# This variable must match your installation's external address but keep in mind that +# it's only used on the command line as a fallback value. APP_URL=http://localhost + +# TRUSTED_PROXIES is a useful variable when using Docker and/or a reverse proxy. TRUSTED_PROXIES= # The log channel defines where your log entries go to. -LOG_CHANNEL=daily - -# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III -# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=yunobase -DB_USERNAME=yunouser -DB_PASSWORD=yunopass - # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/. # Several other options exist. You can use 'single' for one big fat error log (not recommended). # Also available are 'syslog' and 'errorlog' which will log to the system itself. @@ -44,16 +36,39 @@ APP_LOG=daily # nothing will get logged, ever. APP_LOG_LEVEL=notice +# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III +# For other database types, please see the FAQ: http://firefly-iii.readthedocs.io/en/latest/support/faq.html +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=yunobase +DB_USERNAME=yunouser +DB_PASSWORD=yunopass + # If you're looking for performance improvements, you could install memcached. CACHE_DRIVER=file SESSION_DRIVER=file +# You can configure another file storage backend if you cannot use the local storage option. +# To set this up, fill in the following variables. The upload path is used to store uploaded +# files and the export path is to store exported data (before download). +SFTP_HOST= +SFTP_PORT= +SFTP_UPLOAD_PATH= +SFTP_EXPORT_PATH= + +# SFTP uses either the username/password combination or the private key to authenticate. +SFTP_USERNAME= +SFTP_PASSWORD= +SFTP_PRIV_KEY= + # Cookie settings. Should not be necessary to change these. COOKIE_PATH="/" COOKIE_DOMAIN= COOKIE_SECURE=false # If you want Firefly III to mail you, update these settings +# For instructions, see: https://firefly-iii.readthedocs.io/en/latest/installation/mail.html MAIL_DRIVER=mail MAIL_HOST=127.0.0.1 MAIL_PORT=25 @@ -72,6 +87,9 @@ SPARKPOST_SECRET= SEND_REGISTRATION_MAIL=true SEND_ERROR_MESSAGE=true +# These messages contain (sensitive) transaction information: +SEND_REPORT_JOURNALS=true + # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places. MAPBOX_API_KEY= @@ -87,9 +105,52 @@ ANALYTICS_ID= # This makes it easier to migrate your database. Not that some fields will never be decrypted. USE_ENCRYPTION=false +# Firefly III has two options for user authentication. "eloquent" is the default, +# and "adldap" for LDAP servers. +# For full instructions on these settings please visit: +# https://firefly-iii.readthedocs.io/en/latest/installation/authentication.html +LOGIN_PROVIDER=eloquent + +# LDAP connection configuration +# OpenLDAP, FreeIPA or ActiveDirectory +ADLDAP_CONNECTION_SCHEME=OpenLDAP +ADLDAP_AUTO_CONNECT=true + +# LDAP connection settings +ADLDAP_CONTROLLERS= +ADLDAP_PORT=389 +ADLDAP_TIMEOUT=5 +ADLDAP_BASEDN="" +ADLDAP_FOLLOW_REFFERALS=false +ADLDAP_USE_SSL=false +ADLDAP_USE_TLS=false + +ADLDAP_ADMIN_USERNAME= +ADLDAP_ADMIN_PASSWORD= + +ADLDAP_ACCOUNT_PREFIX= +ADLDAP_ACCOUNT_SUFFIX= +ADLDAP_ADMIN_ACCOUNT_PREFIX= +ADLDAP_ADMIN_ACCOUNT_SUFFIX= + +# LDAP authentication settings. +ADLDAP_PASSWORD_SYNC=false +ADLDAP_LOGIN_FALLBACK=false + +ADLDAP_DISCOVER_FIELD=distinguishedname +ADLDAP_AUTH_FIELD=distinguishedname + +# Will allow SSO if your server provides an AUTH_USER field. +WINDOWS_SSO_DISCOVER=samaccountname +WINDOWS_SSO_KEY=AUTH_USER + +# field to sync as local username. +ADLDAP_SYNC_FIELD=userprincipalname + # Leave the following configuration vars as is. # Unless you like to tinker and know what you're doing. APP_NAME=FireflyIII +ADLDAP_CONNECTION=default BROADCAST_DRIVER=log QUEUE_DRIVER=sync REDIS_HOST=127.0.0.1 @@ -104,7 +165,5 @@ DEMO_USERNAME= DEMO_PASSWORD= IS_DOCKER=false IS_SANDSTORM=false -BUNQ_USE_SANDBOX=false IS_HEROKU=false -MAILGUN_DOMAIN= -MAILGUN_SECRET= +BUNQ_USE_SANDBOX=false diff --git a/conf/app.src b/conf/app.src index 4a6f039..44dee3a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/4.7.7.tar.gz -SOURCE_SUM=16c79531dcc202e125bd317b7c672d719346d7d84a4d8fd56704d5119abbcf48 +SOURCE_URL=https://github.com/firefly-iii/firefly-iii/archive/4.7.8.tar.gz +SOURCE_SUM=01e4a2ed6286afc44a98f85588dcb5f96f68ba82e6c3c482b924f23332ed289a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a40767e..d2b45b2 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Firefly III is a self-hosted financial manager.", "fr": "Firefly III est un gestionnaire de finances personnelles." }, - "version": "4.7.7", + "version": "4.7.8", "url": "https://firefly-iii.org/", "license": "GPL v3", "maintainer": {