| OLD | NEW |
| 1 # == Class: adblockplus::buildmaster | 1 # == Class: adblockplus::build::master |
| 2 # | 2 # |
| 3 # An authoritative build-server setup based on Buildbot and Nginx. | 3 # An authoritative build-server setup based on Buildbot and Nginx. |
| 4 # | 4 # |
| 5 # === Parameters: | 5 # === Parameters: |
| 6 # | 6 # |
| 7 # [*domain*] | 7 # [*domain*] |
| 8 # The domain name associated with the Buildbot waterfall page. | 8 # The domain name associated with the Buildbot waterfall page. |
| 9 # | 9 # |
| 10 # [*is_default_domain*] | 10 # [*is_default_domain*] |
| 11 # Whether the Buildbot page should serve as the default content | 11 # Whether the Buildbot page should serve as the default content |
| (...skipping 11 matching lines...) Expand all Loading... |
| 23 # Requires an $ssl_cert to be provided as well. | 23 # Requires an $ssl_cert to be provided as well. |
| 24 # | 24 # |
| 25 # [*slaves*] | 25 # [*slaves*] |
| 26 # Local buildbot::slave records to setup with the master. | 26 # Local buildbot::slave records to setup with the master. |
| 27 # | 27 # |
| 28 # [*slave_credentials*] | 28 # [*slave_credentials*] |
| 29 # Name => password pairs of e.g. remote build slaves. | 29 # Name => password pairs of e.g. remote build slaves. |
| 30 # | 30 # |
| 31 # === Examples: | 31 # === Examples: |
| 32 # | 32 # |
| 33 # class {'adblockplus::buildmaster': | 33 # class {'adblockplus::build::master': |
| 34 # domain => 'localhost', | 34 # domain => 'localhost', |
| 35 # is_default_domain => true, | 35 # is_default_domain => true, |
| 36 # } | 36 # } |
| 37 # | 37 # |
| 38 class adblockplus::buildmaster ( | 38 class adblockplus::build::master ( |
| 39 $domain, | 39 $domain, |
| 40 $is_default_domain = false, | 40 $is_default_domain = false, |
| 41 $buildbot_config = {}, | 41 $buildbot_config = {}, |
| 42 $ssl_cert = hiera('adblockplus::buildmaster::ssl_cert', 'undef'), | 42 $ssl_cert = hiera('adblockplus::build::master::ssl_cert', 'undef'), |
| 43 $ssl_key = hiera('adblockplus::buildmaster::ssl_key', 'undef'), | 43 $ssl_key = hiera('adblockplus::build::master::ssl_key', 'undef'), |
| 44 $slaves = hiera('adblockplus::buildmaster::slaves', {}), | 44 $slaves = hiera('adblockplus::build::master::slaves', {}), |
| 45 $slave_credentials = hiera('adblockplus::buildmaster::slave_credentials', {}), | 45 $slave_credentials = hiera('adblockplus::build::master::slave_credentials', {}
), |
| 46 ) { | 46 ) { |
| 47 | 47 |
| 48 include nginx | 48 include nginx |
| 49 | 49 |
| 50 # change default behavior, but still recognize hiera values | 50 # change default behavior, but still recognize hiera values |
| 51 class {'buildbot': | 51 class {'buildbot': |
| 52 master_service => hiera('buildbot::master_service', 'running'), | 52 master_service => hiera('buildbot::master_service', 'running'), |
| 53 slave_service => hiera('buildbot::slave_service', 'running'), | 53 slave_service => hiera('buildbot::slave_service', 'running'), |
| 54 } | 54 } |
| 55 | 55 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 78 }, | 78 }, |
| 79 source => 'puppet:///modules/adblockplus/nginx/buildmaster.conf', | 79 source => 'puppet:///modules/adblockplus/nginx/buildmaster.conf', |
| 80 is_default => $is_default_domain, | 80 is_default => $is_default_domain, |
| 81 log => 'access_log_buildbot', | 81 log => 'access_log_buildbot', |
| 82 private_key => $ssl_key ? { | 82 private_key => $ssl_key ? { |
| 83 'undef' => undef, | 83 'undef' => undef, |
| 84 default => $ssl_key, | 84 default => $ssl_key, |
| 85 }, | 85 }, |
| 86 } | 86 } |
| 87 } | 87 } |
| OLD | NEW |