| OLD | NEW |
| 1 # == Class: hgweb | 1 # == Class: hgweb |
| 2 # | 2 # |
| 3 # A hgweb server setup. | 3 # A hgweb server setup. |
| 4 # | 4 # |
| 5 # === Parameters: | 5 # === Parameters: |
| 6 # | 6 # |
| 7 # [*domain*] | 7 # [*domain*] |
| 8 # The auhority part of the URL the instance is associated with. | 8 # The auhority part of the URL the instance is associated with. |
| 9 # | 9 # |
| 10 # [*is_default*] | 10 # [*is_default*] |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 $is_default = false, | 41 $is_default = false, |
| 42 $certificate = hiera('hgweb::certificate', 'undef'), | 42 $certificate = hiera('hgweb::certificate', 'undef'), |
| 43 $private_key = hiera('hgweb::private_key', 'undef'), | 43 $private_key = hiera('hgweb::private_key', 'undef'), |
| 44 $hgaccess = 'puppet:///modules/hgweb/hgaccess', | 44 $hgaccess = 'puppet:///modules/hgweb/hgaccess', |
| 45 $templates = hiera('hgweb::templates', '/usr/share/mercurial/templates'), | 45 $templates = hiera('hgweb::templates', '/usr/share/mercurial/templates'), |
| 46 $trac_abpbot_password = hiera('hgweb::trac_abpbot_password', 'abpbot'), | 46 $trac_abpbot_password = hiera('hgweb::trac_abpbot_password', 'abpbot'), |
| 47 ) { | 47 ) { |
| 48 | 48 |
| 49 include ssh, nginx | 49 include ssh, nginx |
| 50 | 50 |
| 51 $required_packages = ['mercurial-common', 'python-flup', 'spawn-fcgi'] | 51 $required_packages = ['mercurial-common', 'spawn-fcgi'] |
| 52 ensure_packages($required_packages) | 52 ensure_packages($required_packages) |
| 53 | 53 |
| 54 class {'sitescripts': | 54 class {'sitescripts': |
| 55 sitescriptsini_content => template('hgweb/sitescripts.ini.erb'), | 55 sitescriptsini_content => template('hgweb/sitescripts.ini.erb'), |
| 56 } | 56 } |
| 57 | 57 |
| 58 user {'hg': | 58 user {'hg': |
| 59 comment => 'hgweb', | 59 comment => 'hgweb', |
| 60 groups => ['www-data'], | 60 groups => ['www-data'], |
| 61 home => '/home/hg', | 61 home => '/home/hg', |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 content => template('hgweb/nginx.conf.erb'), | 188 content => template('hgweb/nginx.conf.erb'), |
| 189 is_default => $is_default, | 189 is_default => $is_default, |
| 190 global_config => template('hgweb/nginx_global.conf.erb'), | 190 global_config => template('hgweb/nginx_global.conf.erb'), |
| 191 log => 'access_log_hg', | 191 log => 'access_log_hg', |
| 192 private_key => $private_key ? { | 192 private_key => $private_key ? { |
| 193 'undef' => undef, | 193 'undef' => undef, |
| 194 default => $private_key, | 194 default => $private_key, |
| 195 }, | 195 }, |
| 196 } | 196 } |
| 197 } | 197 } |
| OLD | NEW |