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

Unified Diff: modules/filterserver/manifests/init.pp

Issue 4894914248704000: Issue 254 - Switch from wildcard certificate to certificates for individual hosts (Closed)
Patch Set: Created April 10, 2014, 9 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/downloadserver/manifests/init.pp ('k') | modules/nagios/manifests/server.pp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/filterserver/manifests/init.pp
===================================================================
--- a/modules/filterserver/manifests/init.pp
+++ b/modules/filterserver/manifests/init.pp
@@ -33,34 +33,22 @@ class filterserver($is_default = false)
mode => 0644,
}
file {'/var/www/easylist':
ensure => directory,
owner => rsync
}
- file {'/etc/nginx/sites-available/inc.easylist-downloads':
- ensure => absent,
- }
-
- file {'/etc/nginx/sites-available/inc.easylist-downloads-txt':
- ensure => absent
- }
-
- file {'/etc/nginx/sites-available/inc.easylist-downloads-tpl':
- ensure => absent
- }
-
nginx::hostconfig{'easylist-downloads.adblockplus.org':
alt_names => 'easylist-msie.adblockplus.org',
source => 'puppet:///modules/filterserver/site.conf',
is_default => $is_default,
- certificate => 'adblockplus.org_sslcert.pem',
- private_key => 'adblockplus.org_sslcert.key',
+ certificate => 'easylist-downloads.adblockplus.org_sslcert.pem',
+ private_key => 'easylist-downloads.adblockplus.org_sslcert.key',
log => 'access_log_easylist_downloads'
}
file {'/home/rsync/.ssh':
ensure => directory,
require => User['rsync'],
owner => rsync,
mode => 0600;
« no previous file with comments | « modules/downloadserver/manifests/init.pp ('k') | modules/nagios/manifests/server.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld