From 6fe4ebe1ec8d907b22360a66fc52b748eda568f8 Mon Sep 17 00:00:00 2001
From: Sebastian Gumprich <sebastian.gumprich@38.de>
Date: Fri, 23 Jun 2017 18:46:50 +0200
Subject: [PATCH] update version, install new dependency

---
 conf/.env          | 75 ++++++++++++++++++++++++++++++++++++----------
 conf/app.src       |  4 +--
 scripts/_common.sh |  2 +-
 scripts/install    |  2 +-
 4 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/conf/.env b/conf/.env
index b1345b8..893dfd8 100644
--- a/conf/.env
+++ b/conf/.env
@@ -1,22 +1,36 @@
-APP_ENV=local
-APP_DEBUG=false
-APP_KEY=base64:T9HB3cjcOlQsHnZo1OLTHsfxTHyFJGG17OtX2KNRjRc=
-APP_URL=yunodomainyunopath
-APP_LOG=daily
-APP_EMAIL_NEW_USERS_NOTIFICATION=yunomail
-APP_DISABLE_SIGNUP=false
+# Two choices: local|production.
+APP_ENV=production
 
+# true if you want to show debug information on error. For production, put this
+# to false.
+APP_DEBUG=false
+
+# The encryption key. This is the most important part of the application. Keep
+# this secure otherwise, everyone will be able to access your application.
+# Must be 32 characters long exactly.
+# Use `php artisan key:generate` to generate a random key.
+APP_KEY=ChangeMeBy32KeyLengthOrGenerated
+
+# The URL of your application.
+APP_URL=yunodomainyunopath
+
+# Frequency of creation of new log files.
+# Possible values: single|daily|syslog|errorlog
+APP_LOG=daily
+
+# Database information
+# To keep this information secure, we urge you to change the default password
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=yunobase
 DB_USERNAME=yunouser
 DB_PASSWORD=yunopass
+DB_TEST_DATABASE=monica_test
+DB_TEST_USERNAME=homestead
+DB_TEST_PASSWORD=secret
 
-CACHE_DRIVER=database
-SESSION_DRIVER=file
-QUEUE_DRIVER=database
-
+# Mail credentials used to send emails from the application.
 MAIL_DRIVER=smtp
 MAIL_HOST=127.0.0.1
 MAIL_PORT=25
@@ -25,10 +39,39 @@ MAIL_PASSWORD=
 MAIL_ENCRYPTION=
 MAIL_FROM_ADDRESS=yunomail
 MAIL_FROM_NAME="Monica@Yunohost"
+APP_EMAIL_NEW_USERS_NOTIFICATION=yunomail
 
-FACEBOOK_CLIENT_ID=
-FACEBOOK_CLIENT_SECRET_ID=
-FACEBOOK_REDIRECT_URL=
+# Default timezone for new users. Users can change this setting inside the
+# application at their leisure.
+# Must be exactly one of the timezones used in this list:
+# https://github.com/monicahq/monica/blob/master/resources/views/settings/index.blade.php#L70
+APP_DEFAULT_TIMEZONE=America/New_York
+
+# Ability to disable signups on your instance. Can be true or false. Default to false.
+APP_DISABLE_SIGNUP=true
+
+# Specific to the hosted version on .com. You probably don't need those.
+# Let them empty if you don't need them.
+GOOGLE_ANALYTICS_APP_ID=
+INTERCOM_APP_ID=
+SENTRY_APP_ID=
+
+# Have access to paid features available on https://monicahq.com, for free.
+# Can be true or false. Default to false.
+# If set to true, that means your users will have to pay to access the paid
+# features. We use Stripe to do this.
+REQUIRES_SUBSCRIPTION=false
+
+# ONLY NECESSARY IF MONICA REQUIRES A SUBSCRIPTION TO WORK
+# Leave blank unless you know what you are doing.
+STRIPE_KEY=
+STRIPE_SECRET=
+PAID_PLAN_FRIENDLY_NAME=
+PAID_PLAN_ID=
+PAID_PLAN_PRICE=
+
+# Change this only if you know what you are doing
+CACHE_DRIVER=database
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
 
-GOOGLE_ANALYTICS=
-INTERCOM=
diff --git a/conf/app.src b/conf/app.src
index dce1b7e..9858ba4 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,2 +1,2 @@
-SOURCE_URL=https://github.com/monicahq/monica/archive/54b65e35.tar.gz
-SOURCE_SUM=3fed39a06507e0f2a7b940cd5a1ac7d332ff44807676df7b0676ad307971b6d1
+SOURCE_URL=https://github.com/monicahq/monica/archive/cdaea00.tar.gz
+SOURCE_SUM=82e3048e6a1d05a1011c3dc738af344795b48a518d89a79ca746dff0055d3355
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f62eb39..c149db0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -3,7 +3,7 @@
 #
 
 # monica git version
-VERSION="c94da55a"
+VERSION="cdaea00"
 
 # Remote URL to fetch monica source tarball
 MONICA_SOURCE_URL="https://github.com/monicahq/monica/archive/${VERSION}.tar.gz"
diff --git a/scripts/install b/scripts/install
index 0eb9dfd..7f68004 100755
--- a/scripts/install
+++ b/scripts/install
@@ -56,7 +56,7 @@ ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass"
 
 # install nodejs
 ynh_install_nodejs 6.10.3
-ynh_package_install g++
+ynh_package_install g++ php7.0-curl
 
 # extract monica into $final_path
 extract_monica $final_path