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 suexec support #712

Merged
merged 1 commit into from
May 2, 2014
Merged

Add suexec support #712

merged 1 commit into from
May 2, 2014

Conversation

ekohl
Copy link
Collaborator

@ekohl ekohl commented May 1, 2014

This adds the suexec_user_group parameter to vhost and introduces a class
apache::mod::suexec, which is included when the parameter is used.

@underscorgan
Copy link
Contributor

Unit test failures:

  1) apache::vhost os-independent items attribute resources when suexec_user_group is specified should contain File[25-rspec.example.com.conf] with content =~ /^SuexecUserGroup nobody nogroup$/
     Failure/Error: it { should contain_file("25-#{title}.conf").with_content %r{^SuexecUserGroup nobody nogroup$} }
       expected that the catalogue would contain File[25-rspec.example.com.conf] with content set to /^SuexecUserGroup nobody nogroup$/ but it is set to "# ************************************\n# Vhost template in module puppetlabs-apache\n# Managed by Puppet\n# ************************************\n\n<VirtualHost *:84>\n  ServerName rspec.example.com\n\n  ## Vhost docroot\n  DocumentRoot \"/rspec/docroot\"\n\n\n\n  ## Directories, there should at least be a declaration for /rspec/docroot\n\n\n  <Directory \"/rspec/docroot\">\n    Options Indexes FollowSymLinks MultiViews\n    AllowOverride None\n    Order allow,deny\n    Allow from all\n  </Directory>\n\n  ## Load additional static includes\n\n\n  ## Logging\n  ErrorLog \"/var/log/apache2/rspec.example.com_error.log\"\n  ServerSignature Off\n  CustomLog \"/var/log/apache2/rspec.example.com_access.log\" combined\n\n\n\n\n  SuexecUserGroup nobody nogroup\n</VirtualHost>\n"

This adds the suexec_user_group parameter to vhost and introduces a
class apache::mod::suexec, which is included when the parameter is used.
@ekohl
Copy link
Collaborator Author

ekohl commented May 2, 2014

Argh. Should be fixed now.

@underscorgan
Copy link
Contributor

Still an issue with Ruby 1.8.7/puppet 2.7

Failures:

  1. apache::mod::php on a RedHat OS with alternative extensions should When you call a matcher in an example without a String, like this:
    specify { object.should matcher }
    or this:
    it { should matcher }
    RSpec expects the matcher to have a #description method. You should either
    add a String to the example this matcher is being used in, or give it a
    description method. Then you won't have to suffer this lengthy warning again.
    Failure/Error: it { should contain_file("php5.conf").with_content =~ /AddHandler php5-script .php .php5\n/ }
    NoMethodError:
    undefined method `matches?' for false:FalseClass

    ./spec/classes/mod/php_spec.rb:73

@ekohl
Copy link
Collaborator Author

ekohl commented May 2, 2014

I wonder if that's related to my patch or just slipped in because of Travis CI breakage.

@underscorgan
Copy link
Contributor

I'll run the tests locally and see what happens...

@underscorgan
Copy link
Contributor

:sigh:

Looks like this is, indeed, an issue with travis.

underscorgan pushed a commit that referenced this pull request May 2, 2014
@underscorgan underscorgan merged commit 4eff354 into puppetlabs:master May 2, 2014
@ekohl ekohl deleted the suexec branch May 3, 2014 11:52
@mbrodala
Copy link

Why was this important PR not merged?

@ekohl
Copy link
Collaborator Author

ekohl commented May 19, 2014

@mbrodala I'm not sure what you mean since it was merged.

@mbrodala
Copy link

@ekohl I'm sorry I was confused since I came from Jira where there's only the "Closed" notice and I didn't double check here.

@ekohl
Copy link
Collaborator Author

ekohl commented May 19, 2014

@mbrodala I can see how Jira would lead you to think that :)

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.

4 participants