Side by Side Diff: modules/filterserver/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
|
« hiera/roles/filterserver.yaml ('k')
|
modules/notificationserver/manifests/init.pp » ('j')
|
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 filterserver($is_default = false) { | 1 class filterserver($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 if !defined(File['/var/www']) { | 5 if !defined(File['/var/www']) { |
| 10 file {'/var/www': | 6 file {'/var/www': |
| 11 ensure => directory, | 7 ensure => directory, |
| 12 owner => nginx, | 8 owner => nginx, |
| 13 mode => '0755', | 9 mode => '0755', |
| 14 require => User['nginx'] | 10 require => User['nginx'] |
| 15 } | 11 } |
| 16 } | 12 } |
| 17 | 13 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 File['/home/rsync/.ssh/id_rsa'], | 98 File['/home/rsync/.ssh/id_rsa'], |
| 103 User['rsync'] | 99 User['rsync'] |
| 104 ], | 100 ], |
| 105 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', | 101 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', |
| 106 environment => hiera('cron::environment', []), | 102 environment => hiera('cron::environment', []), |
| 107 user => rsync, | 103 user => rsync, |
| 108 hour => '*', | 104 hour => '*', |
| 109 minute => '2-52/10' | 105 minute => '2-52/10' |
| 110 } | 106 } |
| 111 } | 107 } |
| OLD | NEW |
« no previous file with comments
|
« hiera/roles/filterserver.yaml ('k')
|
modules/notificationserver/manifests/init.pp » ('j')
|
no next file with comments »
