Merge pull request #294 from dsander/chef-symlinks

Fixed an issue not symlinking the .env file correctly

deployment/site-cookbooks/huginn_production/files/default/env.example

@@ -3,11 +3,15 @@
 # Replace the following with the output from "rake secret"
 APP_SECRET_TOKEN=REPLACE_ME_NOW!
 
-# This is the domain where your Huginn instance will be running.  The default should work
-# for development, but it needs to be changed when you deploy to a production environment.
+# This is the domain where your Huginn instance will be running. The default should work
+# for development, but it needs to be changed to your Huginn domain when you deploy to a
+# production environment (e.g., yourdomain.com, possibly including a port).
 #DOMAIN=localhost:3000
 
-# Database Setup
+############################
+#      Database Setup      #
+############################
+
 DATABASE_ADAPTER=mysql2
 DATABASE_ENCODING=utf8
 DATABASE_RECONNECT=true
@@ -23,10 +27,28 @@ DATABASE_PASSWORD=password
 
 # Configure Rails environment.  This should only be needed in production and may cause errors in development.
 RAILS_ENV=production
+
+# Should Rails force all requests to use SSL?
 FORCE_SSL=false
 
+############################
+#     Allowing Signups     #
+############################
+
+# This invitation code will be required for users to signup with your Huginn installation.
+# You can see its use in user.rb.  PLEASE CHANGE THIS!
+INVITATION_CODE=try-huginn
+
+#############################
+#    Email Configuration    #
+#############################
+
 # Outgoing email settings.  To use Gmail or Google Apps, put your Google Apps domain or gmail.com
 # as the SMTP_DOMAIN and your Gmail username and password as the SMTP_USER_NAME and SMTP_PASSWORD.
+# 
+# PLEASE NOTE: In order to enable emails locally (e.g., when not in the production Rails environment), 
+# you must also change config.action_mailer.perform_deliveries in config/environments/development.rb.
+
 SMTP_DOMAIN=your-domain-here.com
 SMTP_USER_NAME=you@gmail.com
 SMTP_PASSWORD=somepassword
@@ -38,6 +60,44 @@ SMTP_ENABLE_STARTTLS_AUTO=true
 # The address from which system emails will appear to be sent.
 EMAIL_FROM_ADDRESS=from_address@gmail.com
 
-# This invitation code will be required for users to signup with your Huginn installation.
-# You can see its use in user.rb.
-INVITATION_CODE=try-huginn
+###########################
+#      Agent Logging      #
+###########################
+
+# Number of lines of log messages to keep per Agent
+AGENT_LOG_LENGTH=200
+
+#############################
+#  AWS and Mechanical Turk  #
+#############################
+
+# AWS Credentials for MTurk
+AWS_ACCESS_KEY_ID="your aws access key id"
+AWS_ACCESS_KEY="your aws access key"
+
+# Set AWS_SANDBOX to true if you're developing Huginn code.
+AWS_SANDBOX=false
+
+########################
+#   Various Settings   #
+########################
+
+# Specify the HTTP backend library for Faraday, used in WebsiteAgent.
+# You can change this depending on the performance and stability you
+# need for your service.  Any choice other than "typhoeus",
+# "net_http", or "em_http" should require you to bundle a corresponding
+# gem via Gemfile.
+FARADAY_HTTP_BACKEND=typhoeus
+
+# Allow JSONPath eval expresions. i.e., $..price[?(@ < 20)]
+# You should not allow this on a shared Huginn box because it is not secure.
+ALLOW_JSONPATH_EVAL=false
+
+# Enable this setting to allow insecure Agents like the ShellCommandAgent.  Only do this
+# when you trust everyone using your Huginn installation.
+ENABLE_INSECURE_AGENTS=false
+
+# Use Graphviz for generating diagrams instead of using Google Chart
+# Tools.  Specify a dot(1) command path built with SVG support
+# enabled.
+#USE_GRAPHVIZ_DOT=dot

deployment/site-cookbooks/huginn_production/recipes/default.rb

@@ -91,7 +91,7 @@ deploy "/home/huginn" do
       sudo cp /home/huginn/shared/config/nginx.conf /etc/nginx/
       echo 'gem "unicorn", :group => :production' >> Gemfile
       sudo bundle install --without=development --without=test
-      sed -i s/REPLACE_ME_NOW\!/$(sudo bundle exec rake secret)/ .env
+      sed -i s/REPLACE_ME_NOW\!/$(sudo bundle exec rake secret)/ /home/huginn/shared/config/.env
       sudo RAILS_ENV=production bundle exec rake db:create
       sudo RAILS_ENV=production bundle exec rake db:migrate
       sudo RAILS_ENV=production bundle exec rake db:seed