Refactor script locations to clear up root directory.

.deploy/docker/entrypoint.sh

@@ -44,7 +44,7 @@ echo "Remove log file..."
 rm -f $FIREFLY_PATH/storage/logs/laravel.log
 
 echo "Map environment variables on .env file..."
-cat .env.docker | envsubst > .env
+cat $FIREFLY_PATH/.deploy/docker/.env.docker | envsubst > $FIREFLY_PATH/.env
 echo "Dump auto load..."
 composer dump-autoload
 echo "Discover packages..."

.env.testing

@@ -1,178 +0,0 @@
-# You can leave this on "local". If you change it to production most console commands will ask for extra confirmation.
-# Never set it to "testing".
-APP_ENV=testing
-
-# Set to true if you want to see debug information in error screens.
-APP_DEBUG=true
-
-# This should be your email address
-SITE_OWNER=thegrumpydictator+testing@gmail.com
-
-# The encryption key for your database and sessions. Keep this very secure.
-# If you generate a new one all existing data must be considered LOST.
-# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it
-APP_KEY=TestTestTestTestTestTestTestTest
-
-# Change this value to your preferred time zone.
-# Example: Europe/Amsterdam
-TZ=Europe/Amsterdam
-
-# 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.
-# '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', 'errorlog' and 'stdout' which will log to the system itself.
-LOG_CHANNEL=dailytest
-
-# Log level. You can set this from least severe to most severe:
-# debug, info, notice, warning, error, critical, alert, emergency
-# If you set it to debug your logs will grow large, and fast. If you set it to emergency probably
-# nothing will get logged, ever.
-APP_LOG_LEVEL=info
-
-# 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=sqlite
-
-
-
-
-
-
-# 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=log
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_FROM=changeme@example.com
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-# Other mail drivers:
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
-MANDRILL_SECRET=
-SPARKPOST_SECRET=
-
-# Firefly III can send you the following messages
-SEND_REGISTRATION_MAIL=true
-SEND_ERROR_MESSAGE=false
-
-# 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=
-
-# Firefly III currently supports two provider for live Currency Exchange Rates:
-# "fixer" is the default (for backward compatibility), and "ratesapi" is the new one.
-# RatesApi.IO (see https://ratesapi.io) is a FREE and OPEN SOURCE live currency exchange rates,
-# built compatible with Fixer.IO, based on data published by European Central Bank, and don't require API key.
-CER_PROVIDER=fixer
-# If you have select "fixer" as default currency exchange rates,
-# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
-# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
-# the free API up to the point where you might as well offer nothing.
-FIXER_API_KEY=
-
-# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
-ANALYTICS_ID=
-
-# Most parts of the database are encrypted by default, but you can turn this off if you want to.
-# 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 "ldap" 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
- # or 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=
-
-# 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
-
-# You can disable the X-Frame-Options header if it interfears with tools like
-# Organizr. This is at your own risk.
-DISABLE_FRAME_HEADER=false
-
-# 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
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-CACHE_PREFIX=firefly_tst
-SEARCH_RESULT_LIMIT=50
-PUSHER_KEY=
-PUSHER_SECRET=
-PUSHER_ID=
-DEMO_USERNAME=
-DEMO_PASSWORD=
-IS_DOCKER=false
-IS_SANDSTORM=false
-IS_HEROKU=false
-BUNQ_USE_SANDBOX=true
-FFIII_LAYOUT=v1

.sandstorm/build.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 echo "In build.sh"
 
 cd /opt/app
-cp .env.sandstorm .env
+cp .deploy/sandstorm/.env.sandstorm .env
 
 if [ -f /opt/app/composer.json ] ; then
     if [ ! -f composer.phar ] ; then

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: bash
 env:
-  - VERSION=4.7.12
+  - VERSION=4.7.13
 
 dist: xenial
 

composer.json

@@ -123,7 +123,7 @@
   },
   "scripts": {
     "pre-install-cmd": [
-      "@php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.env.heroku', '.env');}\""
+      "@php -r \"if (!(getenv('DYNO'))===false){file_exists('.env') || copy('.deploy/heroku/.env.heroku', '.env');copy('.deploy/heroku/.locales', '.locales')}\""
     ],
     "post-root-package-install": [
       "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""

crowdin.yml

@@ -1,129 +1,11 @@
-#
-# Your crowdin's credentials
-#
 "api_key_env": CROWDIN_API_KEY
 "project_identifier_env": CROWDIN_PROJECT_ID
 "base_path_env": CROWDIN_BASE_PATH
-#"base_url" : ""
-
-#
-# Choose file structure in crowdin
-# e.g. true or false
-#
 "preserve_hierarchy": false
-
-#
-# Files configuration
-#
 files: [
  {
-  #
-  # Source files filter
-  # e.g. "/resources/en/*.json"
-  #
-  "source" : "",
   source: "/resources/lang/en_US/*.php",
-
-  #
-  # where translations live
-  # e.g. "/resources/%two_letters_code%/%original_file_name%"
-  #
-  "translation" : "",
   translation: /resources/lang/%locale_with_underscore%/%original_file_name%,
 
-  #
-  # files or directories for ignore
-  # e.g. ["/**/?.txt", "/**/[0-9].txt", "/**/*\?*.txt"]
-  #
-  #"ignore" : [],
-
-  #
-  # The dest allows you to specify a file name on Crowdin
-  # e.g. "/messages.json"
-  #
-  #"dest" : "",
-
-  #
-  # File type
-  # e.g. "json"
-  #
-  #type:"json"
-
-  #
-  # The parameter "update_option" is optional. If it is not set, translations for changed strings will be lost. Useful for typo fixes and minor changes in source strings.
-  # e.g. "update_as_unapproved" or "update_without_changes"
-  #
-  #"update_option" : "",
-
-  #
-  # Start block only for XML
-  #
-
-  #
-  # Defines whether to translate tags attributes.
-  # e.g. 0 or 1  (Default is 1)
-  #
-  # "translate_attributes" : 1,
-
-  #
-  # Defines whether to translate texts placed inside the tags.
-  # e.g. 0 or 1 (Default is 1)
-  #
-  # "translate_content" : 1,
-
-  #
-  # This is an array of strings, where each item is the XPaths to DOM element that should be imported
-  # e.g. ["/content/text", "/content/text[@value]"]
-  #
-  # "translatable_elements" : [],
-
-  #
-  # Defines whether to split long texts into smaller text segments.
-  # e.g. 0 or 1 (Default is 1)
-  #
-  # "content_segmentation" : 1,
-
-  #
-  # End block only for XML
-  #
-
-  #
-  # Start .properties block
-  #
-
-  #
-  # Defines whether single quote should be escaped by another single quote or backslash in exported translations.
-  # e.g. 0 or 1 or 2 or 3 (Default is 3)
-  # 0 - do not escape single quote;
-  # 1 - escape single quote by another single quote;
-  # 2 - escape single quote by backslash;
-  # 3 - escape single quote by another single quote only in strings containing variables ( {0} ).
-  #
-  # "escape_quotes" : 3,
-
-  #
-  # End .properties block
-  #
-
-  #
-  # Often software projects have custom names for locale directories. crowdin-cli allows you to map your own languages to be understandable by Crowdin.
-  #
-  #"languages_mapping" : {
-  #  "two_letters_code" : {
-  #    "crowdin_language_code" : "local_name"
-  #   }
-  #},
-
-  #
-  # Is first line contains header?
-  # e.g. true or false
-  #
-  #"first_line_contains_header" : true,
-
-  #
-  # for spreadsheets
-  # e.g. "identifier,source_phrase,context,uk,ru,fr"
-  #
-  # "scheme" : "",
  }
 ]