opendev/puppet-ethercalc
Code Issues Proposed changes

Merge "Fix variable access warnings"

Browse Source
This commit is contained in:
Jenkins 2015-07-14 18:10:36 +00:00 committed by Gerrit Code Review
commit b117a4fb1a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
templates/etherpad-lite_settings.json.erb
View File

@ -5,7 +5,7 @@
*/ */
{ {
// Name your instance! // Name your instance!
"title": "<%= etherpad_title %>", "title": "<%= @etherpad_title %>",
//Ip and port which etherpad should bind at //Ip and port which etherpad should bind at
"ip": "127.0.0.1", "ip": "127.0.0.1",
@ -16,17 +16,17 @@
// Session Key, used for reconnecting user sessions // Session Key, used for reconnecting user sessions
// Set this to a secure string at least 10 characters long. Do not share this value. // Set this to a secure string at least 10 characters long. Do not share this value.
"sessionKey" : "<%= sessionKey %>", "sessionKey" : "<%= @sessionKey %>",
//The Type of the database. You can choose between dirty, sqlite and mysql //The Type of the database. You can choose between dirty, sqlite and mysql
//You should use mysql or sqlite for anything else than testing or development //You should use mysql or sqlite for anything else than testing or development
"dbType" : "<%= dbType %>", "dbType" : "<%= @dbType %>",
//the database specific settings //the database specific settings
"dbSettings" : { "dbSettings" : {
"user" : "<%= database_user %>", "user" : "<%= @database_user %>",
"host" : "<%= database_host %>", "host" : "<%= @database_host %>",
"password": "<%= database_password %>", "password": "<%= @database_password %>",
"database": "<%= database_name %>" "database": "<%= @database_name %>"
}, },
//the default text of a pad //the default text of a pad
"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", "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",

6
templates/upstart.erb
View File

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