Side by Side Diff: modules/filterserver/manifests/init.pp
Issue 9545004:
Merged easylist-downloads and easylist-msie configurations (Closed)
Patch Set:
Created March 4, 2013, 8:15 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/files/inc.easylist-downloads-txt ('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 filterserver { | 1 class filterserver { |
| 2 user {'subscriptionstat': | 2 user {'subscriptionstat': |
| 3 ensure => present, | 3 ensure => present, |
| 4 home => '/home/subscriptionstat', | 4 home => '/home/subscriptionstat', |
| 5 managehome => true | 5 managehome => true |
| 6 } | 6 } |
| 7 | 7 |
| 8 file {'/home/subscriptionstat/.ssh': | 8 file {'/home/subscriptionstat/.ssh': |
| 9 ensure => directory, | 9 ensure => directory, |
| 10 owner => subscriptionstat, | 10 owner => subscriptionstat, |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 } | 72 } |
| 73 | 73 |
| 74 file {'/etc/nginx/sites-available/inc.easylist-downloads': | 74 file {'/etc/nginx/sites-available/inc.easylist-downloads': |
| 75 ensure => file, | 75 ensure => file, |
| 76 notify => Service['nginx'], | 76 notify => Service['nginx'], |
| 77 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], | 77 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], |
| 78 source => 'puppet:///modules/filterserver/inc.easylist-downloads' | 78 source => 'puppet:///modules/filterserver/inc.easylist-downloads' |
| 79 } | 79 } |
| 80 | 80 |
| 81 file {'/etc/nginx/sites-available/inc.easylist-downloads-txt': | 81 file {'/etc/nginx/sites-available/inc.easylist-downloads-txt': |
| 82 ensure => file, | 82 ensure => absent |
| 83 notify => Service['nginx'], | |
| 84 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], | |
| 85 source => 'puppet:///modules/filterserver/inc.easylist-downloads-txt' | |
| 86 } | 83 } |
| 87 | 84 |
| 88 file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl': | 85 file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl': |
| 89 ensure => file, | 86 ensure => absent |
| 90 notify => Service['nginx'], | |
| 91 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], | |
| 92 source => 'puppet:///modules/filterserver/inc.easylist-downloads-tpl' | |
| 93 } | 87 } |
| 94 | 88 |
| 95 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.k ey': | 89 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.k ey': |
| 96 ensure => file, | 90 ensure => file, |
| 97 notify => Service['nginx'], | 91 notify => Service['nginx'], |
| 98 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], | 92 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], |
| 99 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.key' | 93 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.key' |
| 100 } | 94 } |
| 101 | 95 |
| 102 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.p em': | 96 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.p em': |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 194 ensure => present, | 188 ensure => present, |
| 195 require => File['/opt/cron_geoipdb_update.sh'], | 189 require => File['/opt/cron_geoipdb_update.sh'], |
| 196 command => '/opt/cron_geoipdb_update.sh', | 190 command => '/opt/cron_geoipdb_update.sh', |
| 197 user => root, | 191 user => root, |
| 198 hour => 3, | 192 hour => 3, |
| 199 minute => 15, | 193 minute => 15, |
| 200 monthday => 3 | 194 monthday => 3 |
| 201 } | 195 } |
| 202 | 196 |
| 203 } | 197 } |
| OLD | NEW |
« no previous file with comments
|
« modules/filterserver/files/inc.easylist-downloads-txt ('k')
|
no next file »
|
no next file with comments »
