summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-14 18:10:36 +0000
committerGerrit Code Review <review@openstack.org>2015-07-14 18:10:36 +0000
commitb117a4fb1ad890087ab9e3441057058114f24f2b (patch)
tree8c32c9038f796f110b6c0dd53e1a895c7fd6f63e
parent61b6b1f69dfbfa1e0d0f878b12fd0b1b87dfcda8 (diff)
parentfb1bd34b87187e7a23324ca2145abd740d884263 (diff)
Merge "Fix variable access warnings"
-rw-r--r--templates/etherpad-lite_settings.json.erb14
-rw-r--r--templates/upstart.erb6
2 files changed, 10 insertions, 10 deletions
diff --git a/templates/etherpad-lite_settings.json.erb b/templates/etherpad-lite_settings.json.erb
index d5effc9..bd5859a 100644
--- a/templates/etherpad-lite_settings.json.erb
+++ b/templates/etherpad-lite_settings.json.erb
@@ -5,7 +5,7 @@
5*/ 5*/
6{ 6{
7 // Name your instance! 7 // Name your instance!
8 "title": "<%= etherpad_title %>", 8 "title": "<%= @etherpad_title %>",
9 9
10 //Ip and port which etherpad should bind at 10 //Ip and port which etherpad should bind at
11 "ip": "127.0.0.1", 11 "ip": "127.0.0.1",
@@ -16,17 +16,17 @@
16 16
17 // Session Key, used for reconnecting user sessions 17 // Session Key, used for reconnecting user sessions
18 // Set this to a secure string at least 10 characters long. Do not share this value. 18 // Set this to a secure string at least 10 characters long. Do not share this value.
19 "sessionKey" : "<%= sessionKey %>", 19 "sessionKey" : "<%= @sessionKey %>",
20 20
21 //The Type of the database. You can choose between dirty, sqlite and mysql 21 //The Type of the database. You can choose between dirty, sqlite and mysql
22 //You should use mysql or sqlite for anything else than testing or development 22 //You should use mysql or sqlite for anything else than testing or development
23 "dbType" : "<%= dbType %>", 23 "dbType" : "<%= @dbType %>",
24 //the database specific settings 24 //the database specific settings
25 "dbSettings" : { 25 "dbSettings" : {
26 "user" : "<%= database_user %>", 26 "user" : "<%= @database_user %>",
27 "host" : "<%= database_host %>", 27 "host" : "<%= @database_host %>",
28 "password": "<%= database_password %>", 28 "password": "<%= @database_password %>",
29 "database": "<%= database_name %>" 29 "database": "<%= @database_name %>"
30 }, 30 },
31 //the default text of a pad 31 //the default text of a pad
32 "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n", 32 "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
diff --git a/templates/upstart.erb b/templates/upstart.erb
index f50cd91..f49ec6f 100644
--- a/templates/upstart.erb
+++ b/templates/upstart.erb
@@ -3,9 +3,9 @@ description "etherpad-lite"
3start on started networking 3start on started networking
4stop on runlevel [!2345] 4stop on runlevel [!2345]
5 5
6env EPHOME=<%= base_install_dir %>/etherpad-lite 6env EPHOME=<%= @base_install_dir %>/etherpad-lite
7env EPLOGS=<%= base_log_dir %>/<%= ep_user %> 7env EPLOGS=<%= @base_log_dir %>/<%= @ep_user %>
8env EPUSER=<%= ep_user %> 8env EPUSER=<%= @ep_user %>
9 9
10respawn 10respawn
11 11