summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-17 18:29:20 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-17 18:29:20 -0200
commitb7af3b1cca7905e34452b5681431ed1c9be58eb8 (patch)
tree79513af98ed5eca1c18428337c8f5c54c1f09274
parentc0d9ca41b09094b1973c5cf9f13838aec5b7af99 (diff)
parentf2a3556aa7b587f0ba03ef19a731b764e5bbffd3 (diff)
downloadpuppet-nginx-b7af3b1cca7905e34452b5681431ed1c9be58eb8.tar.gz
puppet-nginx-b7af3b1cca7905e34452b5681431ed1c9be58eb8.tar.bz2
Merge branch 'master' of ssh://gitosis@git.sarava.org:2203/puppet-nginx
-rw-r--r--manifests/init.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 0eca3f9..68b578b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -110,7 +110,8 @@ class nginx inherits nginx::base {
class nginx::puppetmaster inherits nginx::base {
- define proxy($worker_processes = 4, $worker_connections = 1024,
+ define proxy($name = $domain, $worker_processes = 4,
+ $worker_connections = 1024,
$ssl_port = 8140, $non_ssl_port = 8141,
$puppetmaster_servers = [ "127.0.0.1:18140" ]) {