
* manifests/site.pp: Pass new mysql DB variables to openstack::etherpad*. * modules/etherpad_lite/manifests/apache.pp: Fix broken /etc/ssl/certs permissions (0700 -> 0755). * modules/etherpad_lite/manifests/init.pp: Update default nodejs and etherpad versions. Remove ep_headings plugin install. New plugin define should be used for this instead. Stop making the etherpad-lite ref to checkout optional (defaults to develop). Note these changes are probably not going to be backward compat. * modules/etherpad_lite/manifests/plugin.pp: Define to install etherpad lite plugins. * modules/etherpad_lite/manifests/site.pp: Simplify DB support and remove support for the dirty DB type. * modules/etherpad_lite/templates/etherpad-lite_settings.json.erb: Bring settings erb up to par with latest template. * modules/etherpad_lite/templates/etherpadlite.vhost.erb: Update rewrite rules for new etherpad. Instead of allowing nice pad urls rooted at / redirect these url to /p/padname. Etherpad does not deal well with a change in root path as /p/ is hardcoded in many places. * modules/openstack_project/manifests/etherpad.pp * modules/openstack_project/manifests/etherpad_dev.pp: Update to use new etherpad module setup. MySQL DBs are now externally managed, pass in needed connection info. * modules/mysql_backup/manifests/backup_remote.pp: New define to backup remote DB servers. * modules/mysql_backup/templates/my.cnf.erb: Template for a my.cnf to be used by the cron in backup_remote.pp. Allows for easy connectivity from server using MySQL DB as root. Change-Id: I1250297674b91e81d59cd28c07c52e09967ca548
47 lines
1.4 KiB
Puppet
47 lines
1.4 KiB
Puppet
class openstack_project::etherpad (
|
|
$mysql_password,
|
|
$ssl_cert_file_contents = '',
|
|
$ssl_key_file_contents = '',
|
|
$ssl_chain_file_contents = '',
|
|
$mysql_host = 'localhost',
|
|
$mysql_user = 'eplite',
|
|
$mysql_db_name = 'etherpad-lite',
|
|
$sysadmins = []
|
|
) {
|
|
class { 'openstack_project::server':
|
|
iptables_public_tcp_ports => [22, 80, 443],
|
|
sysadmins => $sysadmins
|
|
}
|
|
|
|
include etherpad_lite
|
|
|
|
class { 'etherpad_lite::apache':
|
|
ssl_cert_file => '/etc/ssl/certs/etherpad.openstack.org.pem',
|
|
ssl_key_file => '/etc/ssl/private/etherpad.openstack.org.key',
|
|
ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
|
|
ssl_cert_file_contents => $ssl_cert_file_contents,
|
|
ssl_key_file_contents => $ssl_key_file_contents,
|
|
ssl_chain_file_contents => $ssl_chain_file_contents,
|
|
}
|
|
|
|
class { 'etherpad_lite::site':
|
|
database_host => $mysql_host,
|
|
database_user => $mysql_user,
|
|
database_name => $mysql_db_name,
|
|
database_password => $mysql_password,
|
|
}
|
|
|
|
etherpad_lite::plugin { 'ep_headings':
|
|
require => Class['etherpad_lite'],
|
|
}
|
|
|
|
mysql_backup::backup_remote { 'etherpad-lite':
|
|
database_host => $mysql_host,
|
|
database_user => $mysql_user,
|
|
database_password => $mysql_password,
|
|
require => Class['etherpad_lite'],
|
|
}
|
|
}
|
|
|
|
# vim:sw=2:ts=2:expandtab:textwidth=79
|