tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

murmur: Convert to parameterized class

Browse source
This commit is contained in:
Ossi Salmi 2013-07-10 16:40:17 +03:00
parent 1396b58024
commit bf315c542d
2 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

48
murmur/manifests/init.pp
View file

@ -1,34 +1,27 @@
# Install murmur (Mumble server). # Install murmur (Mumble server).
# #
# === Global variables # === Parameters
# #
# $murmur_ssl_key: # $ssl_key:
# Path to SSL private key. # Path to SSL private key. Defaults to puppet node key.
# #
# $murmur_ssl_cert: # $ssl_cert:
# Path to SSL certificate. # Path to SSL certificate. Defaults to puppet node certificate.
# #
# $murmur_password: # $password:
# Server passwords. Defaults to none. # Server passwords. Defaults to none.
# #
# $murmur_welcome: # $welcome:
# Server welcome message. # Server welcome message.
# #
class murmur { class murmur($package=$murmur_package_latest,
$ssl_key="${puppet_ssldir}/private_keys/${homename}.pem",
$ssl_cert="${puppet_ssldir}/certs/${homename}.pem",
$password="",
$welcome="<br />Welcome to this server running Murmur.<br />") {
if !$murmur_package { if ! $package {
if $murmur_package_latest { fail("Must define parameter package or \$murmur_package_latest")
$murmur_package = $murmur_package_latest
} else {
fail("Must define \$murmur_package or \$murmur_package_latest")
}
}
if !$murmur_password {
$murmur_password = ""
}
if !$murmur_welcome {
$murmur_welcome = "<br />Welcome to this server running Murmur.<br />"
} }
file { "/usr/local/src/murmur-static_x86.tar.bz2": file { "/usr/local/src/murmur-static_x86.tar.bz2":
@ -36,7 +29,7 @@ class murmur {
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => "puppet:///files/packages/${murmur_package}", source => "puppet:///files/packages/${package}",
} }
util::extract::tar { "/usr/local/murmur": util::extract::tar { "/usr/local/murmur":
strip => 1, strip => 1,
@ -48,20 +41,13 @@ class murmur {
include user::system include user::system
realize(User["murmur"], Group["murmur"]) realize(User["murmur"], Group["murmur"])
if !$murmur_ssl_key {
$murmur_ssl_key = "${puppet_ssldir}/private_keys/${homename}.pem"
}
if !$murmur_ssl_cert {
$murmur_ssl_cert = "${puppet_ssldir}/certs/${homename}.pem"
}
include ssl include ssl
file { "${ssl::certs}/murmur.crt": file { "${ssl::certs}/murmur.crt":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => $murmur_ssl_cert, source => $ssl_cert,
notify => Service["murmur"], notify => Service["murmur"],
} }
file { "${ssl::private}/murmur.key": file { "${ssl::private}/murmur.key":
@ -69,7 +55,7 @@ class murmur {
mode => "0640", mode => "0640",
owner => "root", owner => "root",
group => "murmur", group => "murmur",
source => $murmur_ssl_key, source => $ssl_key,
require => Group["murmur"], require => Group["murmur"],
notify => Service["murmur"], notify => Service["murmur"],
} }

4
murmur/templates/murmur.ini.erb
View file

@ -67,7 +67,7 @@ pidfile=/srv/murmur/murmur.pid
# configure it here than through D-Bus or Ice. # configure it here than through D-Bus or Ice.
# #
# Welcome message sent to clients when they connect # Welcome message sent to clients when they connect
welcometext="<%= @murmur_welcome %>" welcometext="<%= @welcome %>"
# Port to bind TCP and UDP sockets to # Port to bind TCP and UDP sockets to
port=64738 port=64738
@ -77,7 +77,7 @@ port=64738
#host= #host=
# Password to join server # Password to join server
serverpassword=<%= @murmur_password %> serverpassword=<%= @password %>
# Maximum bandwidth (in bits per second) clients are allowed # Maximum bandwidth (in bits per second) clients are allowed
# to send speech at. # to send speech at.