Side by Side Diff: modules/notificationserver/manifests/init.pp
Issue 29481589:
#1981- Remove Nginx initialization from filter server classes (Closed)
Patch Set:
Created July 6, 2017, 9:07 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/filterserver/manifests/init.pp ('k')
|
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 notificationserver($is_default = false) { | 1 class notificationserver($is_default = false) { |
| 2 if !defined(Class['nginx']) { | 2 |
| 3 class {'nginx': | 3 include nginx |
| 4 worker_connections => 4000, | |
| 5 ssl_session_cache => off, | |
| 6 } | |
| 7 } | |
| 8 | 4 |
| 9 class {'sitescripts': | 5 class {'sitescripts': |
| 10 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' | 6 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' |
| 11 } | 7 } |
| 12 | 8 |
| 13 exec {'fetch_notifications': | 9 exec {'fetch_notifications': |
| 14 command => 'hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications', | 10 command => 'hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications', |
| 15 path => ['/usr/bin/', '/bin/'], | 11 path => ['/usr/bin/', '/bin/'], |
| 16 require => [ | 12 require => [ |
| 17 Package['mercurial'], | 13 Package['mercurial'], |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 nginx::hostconfig{'notification.adblockplus.org': | 53 nginx::hostconfig{'notification.adblockplus.org': |
| 58 source => 'puppet:///modules/notificationserver/site.conf', | 54 source => 'puppet:///modules/notificationserver/site.conf', |
| 59 global_config => template('notificationserver/global.conf.erb'), | 55 global_config => template('notificationserver/global.conf.erb'), |
| 60 is_default => $is_default, | 56 is_default => $is_default, |
| 61 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', | 57 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', |
| 62 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', | 58 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', |
| 63 log => 'access_log_notification', | 59 log => 'access_log_notification', |
| 64 log_format => 'notification', | 60 log_format => 'notification', |
| 65 } | 61 } |
| 66 } | 62 } |
| OLD | NEW |
« no previous file with comments
|
« modules/filterserver/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
