Browse Source

Merge "Fix variable access warnings"

Jenkins 3 years ago
parent
commit
b117a4fb1a
2 changed files with 10 additions and 10 deletions
  1. 7
    7
      templates/etherpad-lite_settings.json.erb
  2. 3
    3
      templates/upstart.erb

+ 7
- 7
templates/etherpad-lite_settings.json.erb View File

@@ -5,7 +5,7 @@
5 5
 */
6 6
 {
7 7
   // Name your instance!
8
-  "title": "<%= etherpad_title %>",
8
+  "title": "<%= @etherpad_title %>",
9 9
 
10 10
   //Ip and port which etherpad should bind at
11 11
   "ip": "127.0.0.1",
@@ -16,17 +16,17 @@
16 16
 
17 17
   // Session Key, used for reconnecting user sessions
18 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 21
   //The Type of the database. You can choose between dirty, sqlite and mysql
22 22
   //You should use mysql or sqlite for anything else than testing or development
23
-  "dbType" : "<%= dbType %>",
23
+  "dbType" : "<%= @dbType %>",
24 24
   //the database specific settings
25 25
   "dbSettings" : {
26
-                   "user"    : "<%= database_user %>",
27
-                   "host"    : "<%= database_host %>",
28
-                   "password": "<%= database_password %>",
29
-                   "database": "<%= database_name %>"
26
+                   "user"    : "<%= @database_user %>",
27
+                   "host"    : "<%= @database_host %>",
28
+                   "password": "<%= @database_password %>",
29
+                   "database": "<%= @database_name %>"
30 30
                  },
31 31
   //the default text of a pad
32 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",

+ 3
- 3
templates/upstart.erb View File

@@ -3,9 +3,9 @@ description "etherpad-lite"
3 3
 start on started networking
4 4
 stop on runlevel [!2345]
5 5
 
6
-env EPHOME=<%= base_install_dir %>/etherpad-lite
7
-env EPLOGS=<%= base_log_dir %>/<%= ep_user %>
8
-env EPUSER=<%= ep_user %>
6
+env EPHOME=<%= @base_install_dir %>/etherpad-lite
7
+env EPLOGS=<%= @base_log_dir %>/<%= @ep_user %>
8
+env EPUSER=<%= @ep_user %>
9 9
 
10 10
 respawn
11 11
 

Loading…
Cancel
Save