Начало Разгледай Помощ
Регистриране Влизане
J1X
/
huginn
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
Fixed an issue not symlinking the .env file correctly

Also updated the .env.example to match the default one as close as possible

Dominik Sander преди 11 години
родител
3c5b8649aa
ревизия
d10375ea02
променени са 2 файла, в които са добавени 67 реда и са изтрити 7 реда
Покажи статистика за разликите
  1. 66 6
      deployment/site-cookbooks/huginn_production/files/default/env.example
  2. 1 1
      deployment/site-cookbooks/huginn_production/recipes/default.rb

+ 66 - 6
deployment/site-cookbooks/huginn_production/files/default/env.example
Преглед на файла 

@@ -3,11 +3,15 @@
3 3 
 # Replace the following with the output from "rake secret"
4 4 
 APP_SECRET_TOKEN=REPLACE_ME_NOW!
5 5
6 
-# This is the domain where your Huginn instance will be running.  The default should work
7 
-# for development, but it needs to be changed when you deploy to a production environment.
6 
+# This is the domain where your Huginn instance will be running. The default should work
7 
+# for development, but it needs to be changed to your Huginn domain when you deploy to a
8 
+# production environment (e.g., yourdomain.com, possibly including a port).
8 9 
 #DOMAIN=localhost:3000
9 10
10 
-# Database Setup
11 
+############################
12 
+#      Database Setup      #
13 
+############################
14 
+
11 15 
 DATABASE_ADAPTER=mysql2
12 16 
 DATABASE_ENCODING=utf8
13 17 
 DATABASE_RECONNECT=true
 
@@ -23,10 +27,28 @@ DATABASE_PASSWORD=password
23 27
24 28 
 # Configure Rails environment.  This should only be needed in production and may cause errors in development.
25 29 
 RAILS_ENV=production
30 
+
31 
+# Should Rails force all requests to use SSL?
26 32 
 FORCE_SSL=false
27 33
34 
+############################
35 
+#     Allowing Signups     #
36 
+############################
37 
+
38 
+# This invitation code will be required for users to signup with your Huginn installation.
39 
+# You can see its use in user.rb.  PLEASE CHANGE THIS!
40 
+INVITATION_CODE=try-huginn
41 
+
42 
+#############################
43 
+#    Email Configuration    #
44 
+#############################
45 
+
28 46 
 # Outgoing email settings.  To use Gmail or Google Apps, put your Google Apps domain or gmail.com
29 47 
 # as the SMTP_DOMAIN and your Gmail username and password as the SMTP_USER_NAME and SMTP_PASSWORD.
48 
+#
49 
+# PLEASE NOTE: In order to enable emails locally (e.g., when not in the production Rails environment),
50 
+# you must also change config.action_mailer.perform_deliveries in config/environments/development.rb.
51 
+
30 52 
 SMTP_DOMAIN=your-domain-here.com
31 53 
 SMTP_USER_NAME=you@gmail.com
32 54 
 SMTP_PASSWORD=somepassword
 
@@ -38,6 +60,44 @@ SMTP_ENABLE_STARTTLS_AUTO=true
38 60 
 # The address from which system emails will appear to be sent.
39 61 
 EMAIL_FROM_ADDRESS=from_address@gmail.com
40 62
41 
-# This invitation code will be required for users to signup with your Huginn installation.
42 
-# You can see its use in user.rb.
43 
-INVITATION_CODE=try-huginn
63 
+###########################
64 
+#      Agent Logging      #
65 
+###########################
66 
+
67 
+# Number of lines of log messages to keep per Agent
68 
+AGENT_LOG_LENGTH=200
69 
+
70 
+#############################
71 
+#  AWS and Mechanical Turk  #
72 
+#############################
73 
+
74 
+# AWS Credentials for MTurk
75 
+AWS_ACCESS_KEY_ID="your aws access key id"
76 
+AWS_ACCESS_KEY="your aws access key"
77 
+
78 
+# Set AWS_SANDBOX to true if you're developing Huginn code.
79 
+AWS_SANDBOX=false
80 
+
81 
+########################
82 
+#   Various Settings   #
83 
+########################
84 
+
85 
+# Specify the HTTP backend library for Faraday, used in WebsiteAgent.
86 
+# You can change this depending on the performance and stability you
87 
+# need for your service.  Any choice other than "typhoeus",
88 
+# "net_http", or "em_http" should require you to bundle a corresponding
89 
+# gem via Gemfile.
90 
+FARADAY_HTTP_BACKEND=typhoeus
91 
+
92 
+# Allow JSONPath eval expresions. i.e., $..price[?(@ < 20)]
93 
+# You should not allow this on a shared Huginn box because it is not secure.
94 
+ALLOW_JSONPATH_EVAL=false
95 
+
96 
+# Enable this setting to allow insecure Agents like the ShellCommandAgent.  Only do this
97 
+# when you trust everyone using your Huginn installation.
98 
+ENABLE_INSECURE_AGENTS=false
99 
+
100 
+# Use Graphviz for generating diagrams instead of using Google Chart
101 
+# Tools.  Specify a dot(1) command path built with SVG support
102 
+# enabled.
103 
+#USE_GRAPHVIZ_DOT=dot

+ 1 - 1
deployment/site-cookbooks/huginn_production/recipes/default.rb
Преглед на файла 

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