diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:50:00 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-06-29 16:50:00 -0300 |
| commit | 3a2b922df895b204e14ab8e7cb51661e4956cbc4 (patch) | |
| tree | ca7453b849008ec71dd47cccaed73b14e57c0c25 /manifests/role | |
| parent | adc3ab327f85f7d9c583d8b79b2cac22345c148f (diff) | |
| parent | da49436db33d551c0c0bb09918697102e17f4ec8 (diff) | |
| download | puppet-nodo-3a2b922df895b204e14ab8e7cb51661e4956cbc4.tar.gz puppet-nodo-3a2b922df895b204e14ab8e7cb51661e4956cbc4.tar.bz2 | |
Merge branch 'master' into feature/autoload
Diffstat (limited to 'manifests/role')
| -rw-r--r-- | manifests/role/mail.pp | 1 | ||||
| -rw-r--r-- | manifests/role/proxy.pp | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index 93f7ff7..0f5ba04 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -18,6 +18,7 @@ class nodo::role::mail { package { 'libcache-cache-perl': # needed by munin mysql plugin ensure => present, } + munin::plugin { [ 'mysql_queries', 'mysql_slowqueries', 'mysql_bytes', 'mysql_threads' ]: config => "user root\nenv.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf", ensure => $virtual ? { diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp index ef9c86c..9c6186d 100644 --- a/manifests/role/proxy.pp +++ b/manifests/role/proxy.pp @@ -1,5 +1,17 @@ class nodo::role::proxy inherits nodo::base::vserver { - include nginx + class { 'nginx': } + + ssl::cert { "$::domain": + notify => Service['nginx'], + } + + # For SNI + # TODO: generate automatically + ssl::cert { "example.org": + #generate => true, + verify => false, + notify => Service['nginx'], + } # Graph nginx munin::plugin { [ 'nginx_request', 'nginx_status' ]: |