Side by Side Diff: modules/nginx/manifests/init.pp
Issue 5671492293492736:
Issue 2611 - Log ABP-Notification-Version response header (Closed)
Patch Set:
Created June 9, 2015, 12:38 p.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
|
modules/nginx/templates/site.erb » ('j')
|
modules/notificationserver/templates/global.conf.erb » ('J')
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 nginx ( | 1 class nginx ( |
| 2 $worker_processes = $nginx::params::worker_processes, | 2 $worker_processes = $nginx::params::worker_processes, |
| 3 $worker_connections = $nginx::params::worker_connections, | 3 $worker_connections = $nginx::params::worker_connections, |
| 4 $ssl_session_cache = $nginx::params::ssl_session_cache | 4 $ssl_session_cache = $nginx::params::ssl_session_cache |
| 5 ) inherits nginx::params { | 5 ) inherits nginx::params { |
| 6 | 6 |
| 7 apt::source {'nginx': | 7 apt::source {'nginx': |
| 8 location => "http://nginx.org/packages/ubuntu", | 8 location => "http://nginx.org/packages/ubuntu", |
| 9 repos => "nginx", | 9 repos => "nginx", |
| 10 key => "7BD9BF62", | 10 key => "7BD9BF62", |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 | 41 |
| 42 file {'/etc/nginx/sites-enabled': | 42 file {'/etc/nginx/sites-enabled': |
| 43 ensure => directory, | 43 ensure => directory, |
| 44 require => Package['nginx'] | 44 require => Package['nginx'] |
| 45 } | 45 } |
| 46 | 46 |
| 47 define hostconfig ( | 47 define hostconfig ( |
| 48 $domain = $title, | 48 $domain = $title, |
| 49 $alt_names = [], | 49 $alt_names = [], |
| 50 $log, | 50 $log, |
| 51 $log_format = 'main', | |
| 51 $is_default = false, | 52 $is_default = false, |
| 52 $source = undef, | 53 $source = undef, |
| 53 $content = undef, | 54 $content = undef, |
| 54 $global_config = undef, | 55 $global_config = undef, |
| 55 $certificate = undef, | 56 $certificate = undef, |
| 56 $private_key = undef, | 57 $private_key = undef, |
| 57 $enabled = true) { | 58 $enabled = true) { |
| 58 file {"/etc/nginx/sites-available/${domain}": | 59 file {"/etc/nginx/sites-available/${domain}": |
| 59 ensure => file, | 60 ensure => file, |
| 60 content => template('nginx/site.erb'), | 61 content => template('nginx/site.erb'), |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 120 } | 121 } |
| 121 | 122 |
| 122 service {'nginx': | 123 service {'nginx': |
| 123 ensure => running, | 124 ensure => running, |
| 124 enable => true, | 125 enable => true, |
| 125 restart => '/etc/init.d/nginx reload', | 126 restart => '/etc/init.d/nginx reload', |
| 126 hasstatus => true, | 127 hasstatus => true, |
| 127 require => File['/etc/nginx/nginx.conf'] | 128 require => File['/etc/nginx/nginx.conf'] |
| 128 } | 129 } |
| 129 } | 130 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/nginx/templates/site.erb » ('j')
|
modules/notificationserver/templates/global.conf.erb » ('J')
