Side by Side Diff: modules/rietveld/manifests/init.pp
Issue 29318010:
Issue 2683 - Use Rietveld "adblockplus" branch with custom settings.py (Closed)
Patch Set:
Created June 22, 2015, 11:03 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 class rietveld( | 1 class rietveld( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default = false, | 5 $is_default = false, |
| 6 $secret_key = hiera('rietveld::secret_key', ''), | 6 $secret_key = hiera('rietveld::secret_key', ''), |
| 7 $admins = hiera('rietveld::admins', []), | 7 $admins = hiera('rietveld::admins', []), |
| 8 $oauth2_client_id = hiera('rietveld::oauth2_client_id', ''), | 8 $oauth2_client_id = hiera('rietveld::oauth2_client_id', ''), |
| 9 $oauth2_client_secret = hiera('rietveld::oauth2_client_secret', ''), | 9 $oauth2_client_secret = hiera('rietveld::oauth2_client_secret', ''), |
| 10 ) { | 10 ) { |
| 11 | 11 |
| 12 include nginx | 12 include nginx |
| 13 $rietveld_home = '/opt/rietveld' | 13 $rietveld_home = '/opt/rietveld' |
| 14 $rietveld_branch = 'default' | 14 $rietveld_branch = 'adblockplus' |
| 15 $rietveld_revision = '2259be9bd074' | 15 $rietveld_revision = '5d4e635b14e3' |
| 16 $rietveld_source = 'https://hg.adblockplus.org/rietveld' | 16 $rietveld_source = 'https://hg.adblockplus.org/rietveld' |
| 17 | 17 |
| 18 Exec { | 18 Exec { |
| 19 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', | 19 path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', |
| 20 } | 20 } |
| 21 | 21 |
| 22 nginx::hostconfig {$domain: | 22 nginx::hostconfig {$domain: |
| 23 source => 'puppet:///modules/rietveld/site.conf', | 23 source => 'puppet:///modules/rietveld/site.conf', |
| 24 is_default => $is_default, | 24 is_default => $is_default, |
| 25 certificate => $certificate, | 25 certificate => $certificate, |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 command => "/opt/wrappers/dev_appserver.py \ | 113 command => "/opt/wrappers/dev_appserver.py \ |
| 114 --enable_sendmail --skip_sdk_update_check | 114 --enable_sendmail --skip_sdk_update_check |
| 115 --port 8080 ${rietveld_home}", | 115 --port 8080 ${rietveld_home}", |
| 116 user => 'rietveld', | 116 user => 'rietveld', |
| 117 require => [ | 117 require => [ |
| 118 Exec['install_appengine', 'setup_rietveld'], | 118 Exec['install_appengine', 'setup_rietveld'], |
| 119 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], | 119 File['dev_appserver.py', '_python_runtime.py', 'config.ini'], |
| 120 ], | 120 ], |
| 121 } | 121 } |
| 122 } | 122 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
