Unified Diff: modules/rietveld/manifests/init.pp
Issue 29321002:
Issue 2713 - Move Nginx setup from module "rietveld" to module "codereview" (Closed)
Patch Set:
Created June 23, 2015, 7:52 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/rietveld/files/site.conf ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/rietveld/manifests/init.pp |
| diff --git a/modules/rietveld/manifests/init.pp b/modules/rietveld/manifests/init.pp |
| index a2d7809c70d37e04b49addae1552a7e5d649d350..a6630c985ec74df094b3d2792acf67e4fa4842d9 100644 |
| --- a/modules/rietveld/manifests/init.pp |
| +++ b/modules/rietveld/manifests/init.pp |
| @@ -1,15 +1,10 @@ |
| class rietveld( |
| - $domain, |
| - $certificate, |
| - $private_key, |
| - $is_default = false, |
| $secret_key = hiera('rietveld::secret_key', ''), |
| $admins = hiera('rietveld::admins', []), |
| $oauth2_client_id = hiera('rietveld::oauth2_client_id', ''), |
| $oauth2_client_secret = hiera('rietveld::oauth2_client_secret', ''), |
| ) { |
| - include nginx |
| $rietveld_home = '/opt/rietveld' |
| $rietveld_branch = 'adblockplus' |
| $rietveld_revision = '5d4e635b14e3' |
| @@ -19,14 +14,6 @@ class rietveld( |
| path => '/usr/bin:/usr/sbin:/bin:/usr/local/bin', |
| } |
| - nginx::hostconfig {$domain: |
| - source => 'puppet:///modules/rietveld/site.conf', |
| - is_default => $is_default, |
| - certificate => $certificate, |
| - private_key => $private_key, |
| - log => 'access_log_codereview' |
| - } |
| - |
| package {['wget', 'unzip', 'make', 'patch', 'subversion']: ensure => present} |
| user {'rietveld': |
« no previous file with comments
|
« modules/rietveld/files/site.conf ('k')
|
no next file »
|
no next file with comments »
