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

Unified Diff: manifests/webserver.pp

Issue 5778562212691968: Added redirects for legacy URLs to eyeo.com configuration and added host name aliases (Closed)
Patch Set: Created Jan. 14, 2014, 10:41 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 | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/templates/site.erb » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: manifests/webserver.pp
===================================================================
--- a/manifests/webserver.pp
+++ b/manifests/webserver.pp
@@ -1,18 +1,29 @@
node 'web1' {
include base
class {'web::server':
vhost => 'eyeo.com',
+ is_default => true,
+ aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'],
+ custom_config => '
+ rewrite ^(/de)?/index\.html$ / permanent;
+ rewrite ^(/de)?/job\.html$ /jobs permanent;
+ ',
repository => 'web.eyeo.com',
multiplexer_locations => ['/formmail'],
}
concat::fragment {'formmail_template':
target => '/etc/sitescripts.ini',
- content => "[DEFAULT]\nmailer=/usr/sbin/sendmail\n[formmail]\ntemplate=formmail/template/eyeo.mail\n",
+ content => '
+ [DEFAULT]
+ mailer=/usr/sbin/sendmail
+ [formmail]
+ template=formmail/template/eyeo.mail
+ ',
}
class {'nagios::client':
server_address => 'monitoring.adblockplus.org'
}
}
« no previous file with comments | « no previous file | modules/web/manifests/server.pp » ('j') | modules/web/templates/site.erb » ('J')

Powered by Google App Engine
This is Rietveld