| 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 $rietveld_branch = 'adblockplus' | 9 $rietveld_branch = 'adblockplus' |
| 15 $rietveld_revision = '5d4e635b14e3' | 10 $rietveld_revision = '5d4e635b14e3' |
| 16 $rietveld_source = 'https://hg.adblockplus.org/rietveld' | 11 $rietveld_source = 'https://hg.adblockplus.org/rietveld' |
| 17 | 12 |
| 18 Exec { | 13 Exec { |
| 19 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', | 14 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', |
| 20 } | 15 } |
| 21 | 16 |
| 22 nginx::hostconfig {$domain: | |
| 23 source => 'puppet:///modules/rietveld/site.conf', | |
| 24 is_default => $is_default, | |
| 25 certificate => $certificate, | |
| 26 private_key => $private_key, | |
| 27 log => 'access_log_codereview' | |
| 28 } | |
| 29 | |
| 30 package {['wget', 'unzip', 'make', 'patch', 'subversion']: ensure => present} | 17 package {['wget', 'unzip', 'make', 'patch', 'subversion']: ensure => present} |
| 31 | 18 |
| 32 user {'rietveld': | 19 user {'rietveld': |
| 33 ensure => present, | 20 ensure => present, |
| 34 comment => 'User of the rietveld installation', | 21 comment => 'User of the rietveld installation', |
| 35 home => '/home/rietveld', | 22 home => '/home/rietveld', |
| 36 managehome => true | 23 managehome => true |
| 37 } | 24 } |
| 38 | 25 |
| 39 exec {'download_appengine': | 26 exec {'download_appengine': |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 command => "/opt/wrappers/dev_appserver.py \ | 100 command => "/opt/wrappers/dev_appserver.py \ |
| 114 --enable_sendmail --skip_sdk_update_check | 101 --enable_sendmail --skip_sdk_update_check |
| 115 --port 8080 ${rietveld_home}", | 102 --port 8080 ${rietveld_home}", |
| 116 user => 'rietveld', | 103 user => 'rietveld', |
| 117 require => [ | 104 require => [ |
| 118 Exec['install_appengine', 'setup_rietveld'], | 105 Exec['install_appengine', 'setup_rietveld'], |
| 119 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], | 106 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], |
| 120 ], | 107 ], |
| 121 } | 108 } |
| 122 } | 109 } |
| OLD | NEW |