diff --git a/modules/etherpad_lite/manifests/site.pp b/modules/etherpad_lite/manifests/site.pp index 78808aeca3..6dc3e11fce 100644 --- a/modules/etherpad_lite/manifests/site.pp +++ b/modules/etherpad_lite/manifests/site.pp @@ -2,6 +2,7 @@ # class etherpad_lite::site ( $database_password, + $etherpad_title, $sessionKey = '', $dbType = 'mysql', $database_user = 'eplite', diff --git a/modules/etherpad_lite/templates/etherpad-lite_settings.json.erb b/modules/etherpad_lite/templates/etherpad-lite_settings.json.erb index 4e417f685b..74f3522839 100644 --- a/modules/etherpad_lite/templates/etherpad-lite_settings.json.erb +++ b/modules/etherpad_lite/templates/etherpad-lite_settings.json.erb @@ -5,7 +5,7 @@ */ { // Name your instance! - "title": "OpenStack Etherpad", + "title": "<%= etherpad_title %>", //Ip and port which etherpad should bind at "ip": "127.0.0.1", diff --git a/modules/openstack_project/manifests/etherpad.pp b/modules/openstack_project/manifests/etherpad.pp index a35e987e95..8ab7d04c71 100644 --- a/modules/openstack_project/manifests/etherpad.pp +++ b/modules/openstack_project/manifests/etherpad.pp @@ -25,6 +25,7 @@ class openstack_project::etherpad ( } class { 'etherpad_lite::site': + etherpad_title => 'OpenStack Etherpad', database_host => $mysql_host, database_user => $mysql_user, database_name => $mysql_db_name, diff --git a/modules/openstack_project/manifests/etherpad_dev.pp b/modules/openstack_project/manifests/etherpad_dev.pp index 9fa5dcb94b..787b02a6f0 100644 --- a/modules/openstack_project/manifests/etherpad_dev.pp +++ b/modules/openstack_project/manifests/etherpad_dev.pp @@ -19,6 +19,7 @@ class openstack_project::etherpad_dev ( } class { 'etherpad_lite::site': + etherpad_title => 'OpenStack Dev Etherpad', database_host => $mysql_host, database_user => $mysql_user, database_name => $mysql_db_name,