-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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 stuff to use ITK on Debian #304
Conversation
end | ||
it { should include_class("apache::params") } | ||
it { should_not contain_apache__mod('itk') } | ||
it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Travis doesn't like this
1) apache::mod::itk on a Debian OS should contain File[/usr/local/etc/apache22/Modules/itk.conf] with ensure => "file"
Failure/Error: it { should contain_file("/usr/local/etc/apache22/Modules/itk.conf").with_ensure('file') }
expected that the catalogue would contain File[/usr/local/etc/apache22/Modules/itk.conf]
# ./spec/classes/mod/itk_spec.rb:15:in `block (3 levels) in <top (required)>'
Finished in 2 minutes 43.8 seconds
401 examples, 1 failure
Sorry for my mistake, Travis should be ok now. |
Can you rebase these commits into one? |
Can you add a validate_hash for the itk variable as well. |
An rspec-system test like https://github.com/puppetlabs/puppetlabs-apache/blob/master/spec/system/prefork_worker_spec.rb would be awesome as well. |
as requested:
|
added what needed to have mpm-itk working on Debian based systems.
The rspec-system tests are failing
Did you test on Debian or Ubuntu?
|
Hmm the rspec system tests failing may be unrelated. |
Fixed on of them in #347. Still investigating the other one. |
This check seems to be too restrictive - I've seen that the error message returned by apache differs slightly:
maybe change this check to
With this change, the tests run smoothly again. |
Summary of the changes: Overview: * added support for FreeBSD * added MPMs: event, peruser, itk (PR puppetlabs#304 + FreeBSD support) * added `apache::package` to choose and install apache package, * allow apache::mod to specify mod identifier and module path (puppetlabs#271) * revisited specs for apache::dev and apache::mod::dev Details: * "${apache::params::conf_dir}/Includes" as $apache::confd_dir for FreeBSD, * "${apache::params::conf_dir}/Modules" as $apache::mod_dir FreeBSD, * "${apache::params::conf_dir}/Vhosts" as $apache::vhost_dir FreeBSD, * added to apache::params: $root_group, $apache_package, $service_name, $server_root, $mime_support_package, $mime_types_config * httpd.erb now uses $server_root (instead of $httpd_dir) as ServerRoot * added $mime_support_package parameter to apache::mod::mime class, * apache::mod::mime installs $mime_support_package package if needed, * added $magic_file parameter to apache::mod::mime_magic class, * added 'default_confd_files.pp', and confd template infrastructure to allow putting some files under conf.d/ (Includes/ under FreeBSD) by default (FreeBSD's apache22 installs Includes/no-accf.conf for example but puppet normally would purge it afterward), * adjusted documentation (README.md), * apache::dev requires apache::package on FreeBSD * other (minor or forgotten) changes and additions,
Summary of the changes: Overview: * added support for FreeBSD * added MPMs: event, peruser, itk (PR puppetlabs#304 + FreeBSD support) * added `apache::package` to choose and install apache package, * allow apache::mod to specify mod identifier and module path (puppetlabs#271) * revisited specs for apache::dev and apache::mod::dev Details: * "${apache::params::conf_dir}/Includes" as $apache::confd_dir for FreeBSD, * "${apache::params::conf_dir}/Modules" as $apache::mod_dir FreeBSD, * "${apache::params::conf_dir}/Vhosts" as $apache::vhost_dir FreeBSD, * added to apache::params: $root_group, $apache_package, $service_name, $server_root, $mime_support_package, $mime_types_config * httpd.erb now uses $server_root (instead of $httpd_dir) as ServerRoot * added $mime_support_package parameter to apache::mod::mime class, * apache::mod::mime installs $mime_support_package package if needed, * added $magic_file parameter to apache::mod::mime_magic class, * added 'default_confd_files.pp', and confd template infrastructure to allow putting some files under conf.d/ (Includes/ under FreeBSD) by default (FreeBSD's apache22 installs Includes/no-accf.conf for example but puppet normally would purge it afterward), * adjusted documentation (README.md), * apache::dev requires apache::package on FreeBSD * other (minor or forgotten) changes and additions,
Hi,
This commit add support for mpm_itk on Debian.
http://mpm-itk.sesse.net/
Bests