Issue 5889762565029888: Issue 2104 - Set up a test server for adblockplus.org content

Issue 5889762565029888: Issue 2104 - Set up a test server for adblockplus.org content (Closed)

Created:
March 13, 2015, 3:56 p.m. by Wladimir Palant

Modified:
March 13, 2015, 4:35 p.m.

Reviewers:
Felix Dahlke

CC:
mathias

Visibility:
Public.

Description

This is the absolutely minimal setup for now, custom logic should be added later.

Patch Set 1 #

Total comments: 4

Created: March 13, 2015, 3:56 p.m.

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+74 lines, -2 lines)			Patch
M	Vagrantfile	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	manifests/monitoringserver.pp	View	1 chunk	+2 lines, -1 line	0 comments	Download
M	manifests/vagrant.pp	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	manifests/webserver.pp	View	1 chunk	+18 lines, -0 lines	1 comment	Download
A	modules/private-stub/files/beta.adblockplus.org_sslcert.key	View	1 chunk	+28 lines, -0 lines	0 comments	Download
A	modules/private-stub/files/beta.adblockplus.org_sslcert.pem	View	1 chunk	+22 lines, -0 lines	0 comments	Download
M	modules/web/templates/site.conf.erb	View	1 chunk	+2 lines, -1 line	3 comments	Download

Messages

Total messages: 4

Expand All Messages | Collapse All Messages

Felix Dahlke

http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/manifests/webserver.pp File manifests/webserver.pp (right): http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/manifests/webserver.pp#newcode33 manifests/webserver.pp:33: node 'web2' { It's fine by me for now, ...

March 13, 2015, 4:24 p.m. (2015-03-13 16:24:10 UTC) #2

Wladimir Palant

http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/modules/web/templates/site.conf.erb File modules/web/templates/site.conf.erb (right): http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/modules/web/templates/site.conf.erb#newcode9 modules/web/templates/site.conf.erb:9: <%= custom_config %> On 2015/03/13 16:24:10, Felix H. Dahlke ...

March 13, 2015, 4:27 p.m. (2015-03-13 16:27:06 UTC) #3

Felix Dahlke

March 13, 2015, 4:33 p.m. (2015-03-13 16:33:33 UTC) #4

LGTM, although we should figure out the at sign thing when Matze is back.

http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/modu...
File modules/web/templates/site.conf.erb (right):

http://codereview.adblockplus.org/5889762565029888/diff/5629499534213120/modu...
modules/web/templates/site.conf.erb:9: <%= custom_config %>
On 2015/03/13 16:27:06, Wladimir Palant wrote:
> On 2015/03/13 16:24:10, Felix H. Dahlke wrote:
> > I think we need to add the @ here too - it's either an instance variable or
a
> > local one, hm?
> 
> Frankly, I have no idea about the significance of @ in the ERB templates.
> However, the documentation said that @ has to be used when testing for nil.
> Unlike the if statement, this include works correctly however.

Having read up on this, @ apparently has special significance in ERB files: It's
an ERB variable, while not prepending an @ would just evaluate Ruby code, which
would result in the value of a variable of that name.

So it does sound like we have add an @ here. On the other hand, if it works this
way, alright. Matze can probably say more about this when he's back.

Expand All Messages | Collapse All Messages