Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/filterserver/manifests/init.pp

Issue 9321092: Make sure nginx is properly restarted when the configuration changes (Closed)
Patch Set: Created Feb. 6, 2013, 9:50 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | modules/nginx/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 owner => rsync 65 owner => rsync
66 } 66 }
67 67
68 file {'/var/www/subscriptionStats.ini': 68 file {'/var/www/subscriptionStats.ini':
69 ensure => present, 69 ensure => present,
70 owner => rsync 70 owner => rsync
71 } 71 }
72 72
73 file {'/etc/nginx/sites-available/inc.easylist-downloads': 73 file {'/etc/nginx/sites-available/inc.easylist-downloads':
74 ensure => file, 74 ensure => file,
75 require => Anchor['nginx::end'], 75 notify => Service['nginx'],
Andrey Novikov 2013/02/06 10:03:54 The point was to hide implementation from other mo
Wladimir Palant 2013/02/06 10:42:31 ~> is just an alternative syntax for "notify => ",
76 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], 76 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
77 source => 'puppet:///modules/filterserver/inc.easylist-downloads' 77 source => 'puppet:///modules/filterserver/inc.easylist-downloads'
78 } 78 }
79 79
80 file {'/etc/nginx/sites-available/inc.easylist-downloads-txt': 80 file {'/etc/nginx/sites-available/inc.easylist-downloads-txt':
81 ensure => file, 81 ensure => file,
82 require => Anchor['nginx::end'], 82 notify => Service['nginx'],
83 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], 83 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
84 source => 'puppet:///modules/filterserver/inc.easylist-downloads-txt' 84 source => 'puppet:///modules/filterserver/inc.easylist-downloads-txt'
85 } 85 }
86 86
87 file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl': 87 file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl':
88 ensure => file, 88 ensure => file,
89 require => Anchor['nginx::end'], 89 notify => Service['nginx'],
90 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], 90 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
91 source => 'puppet:///modules/filterserver/inc.easylist-downloads-tpl' 91 source => 'puppet:///modules/filterserver/inc.easylist-downloads-tpl'
92 } 92 }
93 93
94 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.k ey': 94 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.k ey':
95 ensure => file, 95 ensure => file,
96 require => Anchor['nginx::end'], 96 notify => Service['nginx'],
97 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], 97 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
98 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.key' 98 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.key'
99 } 99 }
100 100
101 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.p em': 101 file {'/etc/nginx/sites-available/easylist-downloads.adblockplus.org_sslcert.p em':
102 ensure => file, 102 ensure => file,
103 require => Anchor['nginx::end'], 103 notify => Service['nginx'],
104 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], 104 before => Nginx::Hostconfig['easylist-downloads.adblockplus.org'],
105 mode => 0400, 105 mode => 0400,
106 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.pem' 106 source => 'puppet:///modules/private/easylist-downloads.adblockplus.org_sslc ert.pem'
107 } 107 }
108 108
109 nginx::hostconfig{'easylist-downloads.adblockplus.org': 109 nginx::hostconfig{'easylist-downloads.adblockplus.org':
110 source => 'puppet:///modules/filterserver/easylist-downloads.adblockplus.org ', 110 source => 'puppet:///modules/filterserver/easylist-downloads.adblockplus.org ',
111 enabled => true 111 enabled => true
112 } 112 }
113 113
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 ensure => present, 209 ensure => present,
210 require => File['/opt/cron_geoipdb_update.sh'], 210 require => File['/opt/cron_geoipdb_update.sh'],
211 command => '/opt/cron_geoipdb_update.sh', 211 command => '/opt/cron_geoipdb_update.sh',
212 user => root, 212 user => root,
213 hour => 3, 213 hour => 3,
214 minute => 15, 214 minute => 15,
215 monthday => 3 215 monthday => 3
216 } 216 }
217 217
218 } 218 }
OLDNEW
« no previous file with comments | « no previous file | modules/nginx/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld