| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 Exec['hgaccess_init'], | 90 Exec['hgaccess_init'], |
| 91 ], | 91 ], |
| 92 } | 92 } |
| 93 | 93 |
| 94 exec {'hgaccess_init': | 94 exec {'hgaccess_init': |
| 95 command => 'hg init .', | 95 command => 'hg init .', |
| 96 creates => '/home/hg/web/hgaccess/.hg', | 96 creates => '/home/hg/web/hgaccess/.hg', |
| 97 cwd => '/home/hg/web/hgaccess', | 97 cwd => '/home/hg/web/hgaccess', |
| 98 logoutput => true, | 98 logoutput => true, |
| 99 path => '/usr/local/bin:/usr/bin:/bin', | 99 path => '/usr/local/bin:/usr/bin:/bin', |
| 100 require => File['/home/hg/web/hgaccess'], | 100 require => [ |
| 101 File['/home/hg/web/hgaccess'], |
| 102 Package['mercurial'], |
| 103 ], |
| 101 user => 'hg', | 104 user => 'hg', |
| 102 } | 105 } |
| 103 | 106 |
| 104 exec {'hgaccess_commit': | 107 exec {'hgaccess_commit': |
| 105 command => 'hg add . && hg commit -u Puppet -m "Initial commit"', | 108 command => 'hg add . && hg commit -u Puppet -m "Initial commit"', |
| 106 creates => '/home/hg/.ssh/authorized_keys', | 109 creates => '/home/hg/.ssh/authorized_keys', |
| 107 cwd => '/home/hg/web/hgaccess', | 110 cwd => '/home/hg/web/hgaccess', |
| 108 environment => ['PYTHONPATH=/opt/sitescripts'], | 111 environment => ['PYTHONPATH=/opt/sitescripts'], |
| 109 logoutput => true, | 112 logoutput => true, |
| 110 path => '/usr/local/bin:/usr/bin:/bin', | 113 path => '/usr/local/bin:/usr/bin:/bin', |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 }, | 173 }, |
| 171 source => 'puppet:///modules/hgweb/nginx.conf', | 174 source => 'puppet:///modules/hgweb/nginx.conf', |
| 172 is_default => $is_default, | 175 is_default => $is_default, |
| 173 log => 'access_log_hg', | 176 log => 'access_log_hg', |
| 174 private_key => $private_key ? { | 177 private_key => $private_key ? { |
| 175 'undef' => undef, | 178 'undef' => undef, |
| 176 default => $private_key, | 179 default => $private_key, |
| 177 }, | 180 }, |
| 178 } | 181 } |
| 179 } | 182 } |
| OLD | NEW |