From 2dcced88108500d79f573a7151d1a7b0bfcd286b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= <pacodelaluna@gmail.com>
Date: Tue, 25 Jun 2019 17:59:37 +0200
Subject: [PATCH] Put back application example file as it was

---
 config/application.example.yml | 64 ----------------------------------
 script/setup                   |  2 +-
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 config/application.example.yml

diff --git a/config/application.example.yml b/config/application.example.yml
deleted file mode 100644
index 27710fbbc4..0000000000
--- a/config/application.example.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Add application configuration variables here, as shown below.
-#
-# Change this, it has serious security implications.
-# Minimum 30 but usually 128 characters. To obtain run 'rake secret', or faster, 'openssl rand -hex 128'
-SECRET_TOKEN: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-# Time zone must match the operating system time zone in order to pass all tests.
-# This string is the key for the MAPPING hash constant in ActiveSupport::TimeZone.
-# Documentation including the hash: https://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html
-TIMEZONE: Melbourne
-# Default country for dropdowns etc. See for codes: http://en.wikipedia.org/wiki/ISO_3166-1
-DEFAULT_COUNTRY_CODE: AU
-# Locale for translation.
-LOCALE: en
-# For multilingual - ENV doesn't have array so pass it as string with commas
-AVAILABLE_LOCALES: en,es,en-GB
-# Spree zone.
-CHECKOUT_ZONE: Australia
-# Find currency codes at http://en.wikipedia.org/wiki/ISO_4217.
-CURRENCY: AUD
-
-# The whenever gem can set the `MAILTO` variable for our cron jobs.
-# You can define an email address to notify if any job outputs something.
-# But you need a working mail server setup so that the message is delivered.
-# See: config/schedule.rb
-#SCHEDULE_NOTIFICATIONS: admin@example.com
-
-# Mail settings
-MAIL_HOST: 'example.com'
-MAIL_DOMAIN: 'example.com'
-MAIL_PORT: 25
-SMTP_USERNAME: 'ofn'
-SMTP_PASSWORD: 'f00d'
-
-# Optional mail settings
-# MAIL_SECURE_CONNECTION: 'TLS' # 'None' (default), 'SSL' or 'TLS'
-# MAILS_FROM: hello@example.com
-# MAIL_BCC: manager@example.com
-
-# SingleSignOn login for Discourse
-#
-# DISCOURSE_SSO_SECRET should be a random string. It must be the same as provided to your Discourse instance.
-#DISCOURSE_SSO_SECRET: ""
-#
-# DISCOURSE_URL must be the URL of your Discourse instance.
-#DISCOURSE_URL: "https://noticeboard.openfoodnetwork.org.au"
-
-# see: https://developers.google.com/maps/documentation/javascript/get-api-key
-# GOOGLE_MAPS_API_KEY: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-# optional, see: https://www.skylight.io/oss
-# SKYLIGHT_AUTHENTICATION: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-# Should be set if using Skylight, adds a link to Skylight dashboard to our footer
-# SKYLIGHT_PUBLIC_DASHBOARD_URL: "https://oss.skylight.io/app/applications/xxxxxxxxxx"
-
-# Stripe Connect details for instance account
-# Find these under 'API keys' and 'Connect' in your Stripe account dashboard -> Account Settings
-# Under 'Connect', the Redirect URI should be set to https://YOUR_SERVER_URL/stripe/callbacks (e.g. https://openfoodnetwork.org.uk/stripe/callbacks)
-# Under 'Webhooks', you should set up a Connect endpoint pointing to https://YOUR_SERVER_URL/stripe/webhooks e.g. (https://openfoodnetwork.org.uk/stripe/webhooks)
-# STRIPE_INSTANCE_SECRET_KEY: "sk_test_xxxxxx" # This can be a test key or a live key
-# STRIPE_INSTANCE_PUBLISHABLE_KEY: "pk_test_xxxx" # This can be a test key or a live key
-# STRIPE_CLIENT_ID: "ca_xxxx" # This can be a development ID or a production ID
-# STRIPE_ENDPOINT_SECRET: "whsec_xxxx"
diff --git a/script/setup b/script/setup
index 7064af6f80..65f46d7949 100755
--- a/script/setup
+++ b/script/setup
@@ -43,7 +43,7 @@ npm install
 
 # Set up configurable environment variables
 if [ ! -f config/application.yml ]; then
-  cp config/application.example.yml config/application.yml
+  cp config/application.yml.example config/application.yml
   printf "${YELLOW}Copied config/application.yml Make sure to fill it with the appropriate configuration values.\n\n${NO_COLOR}"
 fi