EL7 uses conf.modules.d directory for modules. #1305
Conversation
| $mod_dir = "${httpd_dir}/conf.d" | ||
| $mod_dir = $::apache::version::distrelease ? { | ||
| '7' => "${httpd_dir}/conf.modules.d", | ||
| default => "${httpd_dir}/conf.d", |
There was a problem hiding this comment.
this should be using versioncmp()
There was a problem hiding this comment.
Agree, for the sake of consistency and maintainability.
There was a problem hiding this comment.
If you want to talk consistency, then look further down in the file (line 101) where it's using the same syntax I'm using.
|
@jasonhancock Are you able to address the feedback left by @igalic and also squash the commits? |
|
@jasonhancock you're right. Apache in general needs some cleanup. Do you mind squashing? I'll investigate the pcci failures. |
|
@jasonhancock it appears the acceptance test failures on centos7 are related to this change. |
This is briefly mentioned in [MODULES-1734](https://tickets.puppetlabs.com/browse/MODULES-1734), but the EL7 uses the conf.modules.d directory for module configuration. Also cleaned up some of the acceptance tests to use the common config in `version.rb` to DRY
|
@bmjen commits squashed and my test failures fixed. I'm not sure I understand the Ubuntu 14.04 fastcgi failure. Looks like it's not finding the libapache2-mod-fastcgi package, but I was unable to repoduce the issue locally on a 14.04 vagrant VM. |
|
@jasonhancock Thanks! Ignore the fastcgi errors those are fixed in master. |
EL7 uses conf.modules.d directory for modules.
This is briefly mentioned in MODULES-1734, but EL7 uses the conf.modules.d directory for module configuration.