Delta Between Two Patch Sets: modules/notificationserver/manifests/init.pp
Issue 5302563972841472:
Merge filter and notification servers, have both tasks run on the same servers (Closed)
Left Patch Set:
Created Jan. 30, 2014, 11:49 a.m.
Right Patch Set: Stopped misusing is_default parameter
Created Jan. 30, 2014, 2:10 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« modules/filterserver/templates/easylist-downloads.adblockplus.org.erb ('k')
|
modules/notificationserver/templates/notification.adblockplus.org.erb » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 1 class notificationserver($is_default = false) { | 1 class notificationserver($is_default = false) { |
| 2 if $is_default { | 2 if !defined(Class['nginx']) { |
| 3 class {'nginx': | 3 class {'nginx': |
| 4 worker_processes => 2, | 4 worker_processes => 2, |
| 5 worker_connections => 4000, | 5 worker_connections => 4000, |
| 6 ssl_session_cache => off, | 6 ssl_session_cache => off, |
| 7 } | 7 } |
| 8 } | |
| 8 | 9 |
| 10 if !defined(File['/var/www']) { | |
| 9 file {'/var/www': | 11 file {'/var/www': |
| 10 ensure => directory, | 12 ensure => directory, |
| 11 owner => nginx, | 13 owner => nginx, |
| 12 mode => 0755, | 14 mode => 0755, |
| 13 require => Package['nginx'] | 15 require => Package['nginx'] |
| 14 } | 16 } |
| 15 } | 17 } |
| 16 | 18 |
| 17 class {'sitescripts': | 19 class {'sitescripts': |
| 18 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' | 20 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 74 enabled => true | 76 enabled => true |
| 75 } | 77 } |
| 76 | 78 |
| 77 file {'/etc/logrotate.d/nginx_notification.adblockplus.org': | 79 file {'/etc/logrotate.d/nginx_notification.adblockplus.org': |
| 78 ensure => file, | 80 ensure => file, |
| 79 mode => 0444, | 81 mode => 0444, |
| 80 require => Nginx::Hostconfig['notification.adblockplus.org'], | 82 require => Nginx::Hostconfig['notification.adblockplus.org'], |
| 81 source => 'puppet:///modules/notificationserver/logrotate' | 83 source => 'puppet:///modules/notificationserver/logrotate' |
| 82 } | 84 } |
| 83 } | 85 } |
| LEFT | RIGHT |
