Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fastcgi index #1062

Merged
merged 1 commit into from
Apr 12, 2017
Merged

Add fastcgi index #1062

merged 1 commit into from
Apr 12, 2017

Conversation

elmobp
Copy link
Contributor

@elmobp elmobp commented Apr 4, 2017

Add the fastcgi index to the server resource

@wyardley
Copy link
Collaborator

wyardley commented Apr 6, 2017

@elmobp can you add tests?
If it's valid in other contexts, can you add them there for completeness, if possible?

@elmobp
Copy link
Contributor Author

elmobp commented Apr 6, 2017

Sure! I think the location bits needs some work though

So we could do something along the lines of
location: '/'
fastcgi_pass: '127.0.0.1:9000'
location: '/test'
fastcgi_pass: '127.0.0.1:9001'

I will look at doing this in another PR though

@wyardley
Copy link
Collaborator

@elmobp That sounds very reasonable. Will you be able to add spec tests for this particular PR though?

@elmobp
Copy link
Contributor Author

elmobp commented Apr 11, 2017

hey @wyardley sorry been tied up on a project I will get these done Wednesday

@elmobp
Copy link
Contributor Author

elmobp commented Apr 11, 2017

@wyardley hows that look?

@wyardley
Copy link
Collaborator

@elmobp Sorry, didn't mean to rush you! Test looks good, voxpupuli usually asks that the commits be squashed back to a single one (rebase / force-push the branch).

I'll make one other request, sorry that I didn't notice it before.

@@ -254,6 +255,7 @@
Optional[String] $proxy_buffering = undef,
Array $resolver = [],
Optional[String] $fastcgi = undef,
$fastcgi_index = undef,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you prefix this with Optional[String] to match the rest?

@vinzent vinzent added enhancement New feature or request needs-work labels Apr 11, 2017
@elmobp
Copy link
Contributor Author

elmobp commented Apr 11, 2017

Done!

@wyardley wyardley merged commit b127b39 into voxpupuli:master Apr 12, 2017
@wyardley
Copy link
Collaborator

@elmobp Looks good to me, sorry there were so many hoops to jump through on this one. Merging.

@@ -159,7 +161,7 @@
is_expected.to contain_apt__source('nginx').with(
'location' => "https://nginx.org/packages/#{operatingsystem.downcase}",
'repos' => 'nginx',
'key' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62'
'key' => { 'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62' }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this was from another commit? Next time, rebase rather than merge master.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops!

@@ -37,21 +37,21 @@
apt::source { 'nginx':
location => "https://nginx.org/packages/${distro}",
repos => 'nginx',
key => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62',
key => {'id' => '573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62'},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here too... @bastelfreak is this Ok, since this is one that was already merged, just kind of confusing commit message.... Or should I revert?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Want a fresh PR? to fix them

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@elmobp yeah, let's just do that.

This was referenced Apr 12, 2017
cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Sep 13, 2019
Rubueno pushed a commit to Rubueno/puppet-nginx that referenced this pull request Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants