On Tue, Mar 27, 2012 at 02:34:46PM -0400, Jason Guiditta wrote:
On 26/03/12 14:49 -0400, Matt Wagner wrote:
>---
>recipes/aeolus/files/aggregator-httpd-ssl.conf | 11 ++++++++++-
>1 files changed, 10 insertions(+), 1 deletions(-)
>
Maybe there was another patch I didnt see, but what about the file in
conductor? conf/aeolus-conductor-httpd.conf
Oops, I somehow managed to not reply to this previously.
As best as I can tell, the file in Conductor is not used anywhere. It
should be removed.
Oh, and hmm, looking at configure src, there is a simiar file to what
you changed, but minus ssl. Seems to me like at least one (if not
more) of these 3 shoudl go away, and all remaining should be fixed.
And those ancient names should be fixed, I can believe there are any
refs to aggregator anymore, insane! (That doesnt have to be in this
atchset, but I suspect if it isn't we'll forget for another couple
years...) Just did quick search, and these look like the offending
references:
../aeolus-configure/pkg/aeolus-configure-2.6.0/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd-ssl.conf'}
../aeolus-configure/pkg/aeolus-configure-2.6.0/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd.conf'}
../aeolus-configure/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd-ssl.conf'}
../aeolus-configure/recipes/aeolus/manifests/conductor.pp:
apache::site{"aeolus-conductor": source =>
'puppet:///modules/aeolus/aggregator-httpd.conf'}
As best as I can tell, this is the only file that needs updating.
Conductor is basically HTTPS-only; the HTTP interface merely redirects
to the HTTP one. It would probably be better to clean all of this up,
but I would argue it should take place in a separate commit.
I had thought this was fixed, but it looks like it's not. :-\
-- Matt