summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-27 16:34:59 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-27 16:34:59 -0200
commit4d338f410af8d2e3d0431ea8c30968bdaf7278f2 (patch)
tree14824d47ff40176a0918cb992c5718b2ff7d77bc /templates
parentdc3ae9c0b0d788862fe6959cddea1a6a8b091cce (diff)
downloadpuppet-etherpad-4d338f410af8d2e3d0431ea8c30968bdaf7278f2.tar.gz
puppet-etherpad-4d338f410af8d2e3d0431ea8c30968bdaf7278f2.tar.bz2
Switching to parametrized class and hiera
Diffstat (limited to 'templates')
-rw-r--r--templates/settings.json.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/settings.json.erb b/templates/settings.json.erb
index 45e6017..ee538a0 100644
--- a/templates/settings.json.erb
+++ b/templates/settings.json.erb
@@ -21,7 +21,7 @@
"dbSettings" : {
"user" : "etherpad",
"host" : "localhost",
- "password": "<%= etherpad_db_password %>",
+ "password": "<%= db_password %>",
"database": "etherpad"
},
@@ -69,7 +69,7 @@
*/
"users": {
"admin": {
- "password": "<%= etherpad_admin_password %>",
+ "password": "<%= admin_password %>",
"is_admin": true
}
},