Side by Side Diff: modules/notificationserver/manifests/init.pp
Issue 29327575:
Issue 3062 - Explicitly ensure user "nginx" is present (Closed)
Patch Set: Issue 3062 - Now without accidental inclusion of trac.ini.erb
Created Sept. 12, 2015, 1:13 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/nginx/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 if !defined(Class['nginx']) { |
| 3 class {'nginx': | 3 class {'nginx': |
| 4 worker_connections => 4000, | 4 worker_connections => 4000, |
| 5 ssl_session_cache => off, | 5 ssl_session_cache => off, |
| 6 } | 6 } |
| 7 } | 7 } |
| 8 | 8 |
| 9 class {'sitescripts': | 9 class {'sitescripts': |
| 10 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' | 10 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' |
| 11 } | 11 } |
| 12 | 12 |
| 13 exec {'fetch_notifications': | 13 exec {'fetch_notifications': |
| 14 command => 'hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications', | 14 command => 'hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications', |
| 15 path => ['/usr/bin/', '/bin/'], | 15 path => ['/usr/bin/', '/bin/'], |
| 16 require => [ | 16 require => [ |
| 17 Package['mercurial'], | 17 Package['mercurial'], |
| 18 Package['nginx'], | 18 User['nginx'], |
| 19 ], | 19 ], |
| 20 onlyif => 'test ! -d /opt/notifications' | 20 onlyif => 'test ! -d /opt/notifications' |
| 21 } | 21 } |
| 22 | 22 |
| 23 cron {'update_notifications': | 23 cron {'update_notifications': |
| 24 command => 'hg pull -q -u -R /opt/notifications', | 24 command => 'hg pull -q -u -R /opt/notifications', |
| 25 environment => ['MAILTO=admins@adblockplus.org,root'], | 25 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 26 minute => '*/5', | 26 minute => '*/5', |
| 27 user => 'nginx', | 27 user => 'nginx', |
| 28 require => Exec['fetch_notifications'], | 28 require => Exec['fetch_notifications'], |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 54 nginx::hostconfig{'notification.adblockplus.org': | 54 nginx::hostconfig{'notification.adblockplus.org': |
| 55 source => 'puppet:///modules/notificationserver/site.conf', | 55 source => 'puppet:///modules/notificationserver/site.conf', |
| 56 global_config => template('notificationserver/global.conf.erb'), | 56 global_config => template('notificationserver/global.conf.erb'), |
| 57 is_default => $is_default, | 57 is_default => $is_default, |
| 58 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', | 58 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', |
| 59 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', | 59 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', |
| 60 log => 'access_log_notification', | 60 log => 'access_log_notification', |
| 61 log_format => 'notification', | 61 log_format => 'notification', |
| 62 } | 62 } |
| 63 } | 63 } |
| OLD | NEW |
« no previous file with comments
|
« modules/nginx/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
