| OLD | NEW |
| 1 class rietveld( | 1 class rietveld( |
| 2 $domain, | |
| 3 $certificate, | |
| 4 $private_key, | |
| 5 $is_default = false, | |
| 6 $secret_key = hiera('rietveld::secret_key', ''), | 2 $secret_key = hiera('rietveld::secret_key', ''), |
| 7 $admins = hiera('rietveld::admins', []), | 3 $admins = hiera('rietveld::admins', []), |
| 8 $oauth2_client_id = hiera('rietveld::oauth2_client_id', ''), | 4 $oauth2_client_id = hiera('rietveld::oauth2_client_id', ''), |
| 9 $oauth2_client_secret = hiera('rietveld::oauth2_client_secret', ''), | 5 $oauth2_client_secret = hiera('rietveld::oauth2_client_secret', ''), |
| 10 ) { | 6 ) { |
| 11 | 7 |
| 12 include nginx | |
| 13 $rietveld_home = '/opt/rietveld' | 8 $rietveld_home = '/opt/rietveld' |
| 14 | 9 |
| 15 Exec { | 10 Exec { |
| 16 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', | 11 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', |
| 17 } | 12 } |
| 18 | 13 |
| 19 nginx::hostconfig {$domain: | |
| 20 source => 'puppet:///modules/rietveld/site.conf', | |
| 21 is_default => $is_default, | |
| 22 certificate => $certificate, | |
| 23 private_key => $private_key, | |
| 24 log => 'access_log_codereview' | |
| 25 } | |
| 26 | |
| 27 package {['wget', 'unzip', 'git', 'make', 'patch', 'subversion']: ensure => pr
esent} | 14 package {['wget', 'unzip', 'git', 'make', 'patch', 'subversion']: ensure => pr
esent} |
| 28 | 15 |
| 29 user {'rietveld': | 16 user {'rietveld': |
| 30 ensure => present, | 17 ensure => present, |
| 31 comment => 'User of the rietveld installation', | 18 comment => 'User of the rietveld installation', |
| 32 home => '/home/rietveld', | 19 home => '/home/rietveld', |
| 33 managehome => true | 20 managehome => true |
| 34 } | 21 } |
| 35 | 22 |
| 36 exec {'download_appengine': | 23 exec {'download_appengine': |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 command => "/opt/wrappers/dev_appserver.py \ | 95 command => "/opt/wrappers/dev_appserver.py \ |
| 109 --enable_sendmail --skip_sdk_update_check | 96 --enable_sendmail --skip_sdk_update_check |
| 110 --port 8080 ${rietveld_home}", | 97 --port 8080 ${rietveld_home}", |
| 111 user => 'rietveld', | 98 user => 'rietveld', |
| 112 require => [ | 99 require => [ |
| 113 Exec['install_appengine', 'setup_rietveld'], | 100 Exec['install_appengine', 'setup_rietveld'], |
| 114 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], | 101 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], |
| 115 ], | 102 ], |
| 116 } | 103 } |
| 117 } | 104 } |
| OLD | NEW |