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 stuff to use ITK on Debian #304

Merged
merged 1 commit into from
Sep 5, 2013
Merged

Add stuff to use ITK on Debian #304

merged 1 commit into from
Sep 5, 2013

Conversation

kumy
Copy link
Contributor

@kumy kumy commented Aug 19, 2013

Hi,

This commit add support for mpm_itk on Debian.

http://mpm-itk.sesse.net/

Bests

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') }
Copy link
Contributor

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

@kumy
Copy link
Contributor Author

kumy commented Aug 25, 2013

Sorry for my mistake, Travis should be ok now.

@blkperl
Copy link
Contributor

blkperl commented Aug 30, 2013

Can you rebase these commits into one?

@blkperl
Copy link
Contributor

blkperl commented Aug 30, 2013

Can you add a validate_hash for the itk variable as well.

@blkperl
Copy link
Contributor

blkperl commented Aug 30, 2013

An rspec-system test like https://github.com/puppetlabs/puppetlabs-apache/blob/master/spec/system/prefork_worker_spec.rb would be awesome as well.

@blkperl blkperl mentioned this pull request Aug 30, 2013
@kumy
Copy link
Contributor Author

kumy commented Aug 30, 2013

as requested:

  • merged commits into one
  • use validate_hash
  • add the rspec-system test

added what needed to have mpm-itk working on Debian based systems.
@blkperl
Copy link
Contributor

blkperl commented Sep 4, 2013

The rspec-system tests are failing

Error: You must include the apache base class before using any apache defined resources at /etc/puppet/modules/apache/manifests/vhost.pp:125 on node main.foo.vm

Did you test on Debian or Ubuntu?

RSPEC_SET=ubuntu-server-12042-x64 rake spec:system
Failures:

  1) apache::vhost define apache_directories readme example, adapted should configure a vhost with Files
     Failure/Error: }) { |r| [0,2].should include r.exit_code}


     # ./spec/system/vhost_spec.rb:126:in `block (4 levels) in <top (required)>'
     # ./spec/system/vhost_spec.rb:126:in `block (3 levels) in <top (required)>'

  2) apache::vhost define apache_directories readme example, adapted should answer to files.example.net
     Failure/Error: r.stderr.should == "curl: (22) The requested URL returned error: 403 Forbidden\n"


     # ./spec/system/vhost_spec.rb:136:in `block (4 levels) in <top (required)>'
     # ./spec/system/vhost_spec.rb:135:in `block (3 levels) in <top (required)>'

Finished in 4 minutes 25.4 seconds
55 examples, 2 failures

@blkperl
Copy link
Contributor

blkperl commented Sep 4, 2013

Hmm the rspec system tests failing may be unrelated.

@blkperl
Copy link
Contributor

blkperl commented Sep 4, 2013

Fixed on of them in #347. Still investigating the other one.

@ptomulik
Copy link
Contributor

ptomulik commented Sep 4, 2013

https://github.com/blkperl/puppetlabs-apache/blob/92abe84d8ef9fb907582ca84ffb0fe25f0fef7e6/spec/system/vhost_spec.rb#L137

This check seems to be too restrictive - I've seen that the error message returned by apache differs slightly:

curl: (22) The requested URL returned error: 403

maybe change this check to

         r.stderr.should =~ /curl: \(22\) The requested URL returned error: 403/

With this change, the tests run smoothly again.

blkperl added a commit that referenced this pull request Sep 5, 2013
Add stuff to use ITK on Debian
@blkperl blkperl merged commit 0b47f7c into puppetlabs:master Sep 5, 2013
ptomulik added a commit to ptomulik/puppetlabs-apache that referenced this pull request Sep 6, 2013
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,
@kumy kumy deleted the itk branch September 10, 2013 16:40
ptomulik added a commit to ptomulik/puppetlabs-apache that referenced this pull request Nov 9, 2013
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,
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants