search

voxpupuli / puppet-squid

Puppet module for configuration of squid caching proxy.
https://forge.puppet.com/puppet/squid
Other
12 stars 54 forks source link

Fix `url_rewrite_program` #101

Closed SourceDoctor closed 6 years ago

SourceDoctor commented 6 years ago

moves url_rewrite_program into Header, cause it's only once useable. Also fixes some squid Configfile grammars and styles

SourceDoctor commented 6 years ago

Hi, something new about state for merging this fix?

SourceDoctor commented 6 years ago

something wrong with this merge Request?

SourceDoctor commented 6 years ago

@alexjfisher is there something i've missed? i changed only from "unless" to "if" now 2/3 of tests are failing?

alexjfisher commented 6 years ago

@SourceDoctor It's not you, just the passage of time. Since you first opened this PR, there's been new releases of beaker-puppet. One of these broke some of our tests. But since https://github.com/puppetlabs/beaker-puppet/pull/73 was merged, at least it's easy to figure out what needs fixing up. :)

https://github.com/voxpupuli/puppet-squid/blob/master/spec/acceptance/class_spec.rb#L5

alexjfisher commented 6 years ago

This should be fixed in https://github.com/voxpupuli/puppet-squid/pull/111

alexjfisher commented 6 years ago

Fix has been merged, so hopefully this PR will pass now. (travis tests the result of merging the PR branch to master, not the branch itself).

alexjfisher commented 6 years ago

Damn, a couple of acceptance tests still failing. I'll try to take a look tomorrow.

SourceDoctor commented 6 years ago

ok so? :)

alexjfisher commented 6 years ago

Not quite. You are now the committer, but the author is still root. Try with --amend --reset-author

alexjfisher commented 6 years ago

git log --pretty=fuller if you want to confirm.

SourceDoctor commented 6 years ago

oh, my fault. Now it's like it should be :-)

alexjfisher commented 6 years ago

The email address you've used isn't registered on your github profile, (meaning the commit doesn't link back to your github id). It also differs from the one you've used on your other commits. Is this intentional?

SourceDoctor commented 6 years ago

i had a typo, sry.

alexjfisher commented 6 years ago

Merged! Thanks.

You might want to add the googlemail.com email variant to your github profile so that your previous commits also link to your account.