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

Added in mod_actions to the repo so it may be used. #591

Merged
merged 1 commit into from
Mar 3, 2014

Conversation

typhonius
Copy link
Contributor

No description provided.

@@ -269,7 +269,7 @@
:attr => 'scriptalias',
:value => '/usr/scripts',
:match => [
/^ ScriptAlias \/cgi-bin\/ \/usr\/scripts$/,
/^ ScriptAlias \/cgi-bin \/usr\/scripts$/,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a general rule of thumb, you want either:

ScriptAlias /cgi-bin/ /usr/scripts/

XOR

ScriptAlias /cgi-bin /usr/scripts

you do not want to mix those.
It's generally better to use the first of these options.

@typhonius
Copy link
Contributor Author

I was unable to get /cgi-bin/ working with Action. The following appears to be the only way I'm able to get a workable response:

Action php-fastcgi /cgi-bin virtual
ScriptAlias /cgi-bin /usr/sbin/php-fpm

If I'm overlooking something however, I'd be happy to change it up!

@igalic
Copy link
Contributor

igalic commented Jan 27, 2014

General comments: Could you please add a spec/acceptance test?
I'd also like to see a more terse commit message. Could you please squash those commits down to one?

Please also check why Travis is failing

@blkperl
Copy link
Contributor

blkperl commented Feb 6, 2014

This no longer merges cleanly, please rebase this branch against master. Thanks.

@typhonius
Copy link
Contributor Author

I've rebased this against master and squashed commits into what I hope is just the one. I'm still fairly new to contributing back to puppet so if there is anything that I've done incorrectly I'm happy to alter again. Thanks for your guidance thus far!

@igalic
Copy link
Contributor

igalic commented Mar 2, 2014

Those are three commits right now.

The way to rebase is like so:

% git remote add upstream git@github.com:puppetlabs/puppetlabs-apache
% git remote update
% git status # to see if anything needs committing or else stashing
% git rebase upstream/master

This should get rid of ensure that you don't have any merge-tracking commits, like typhonius@dbc1bd4

To squash commits, you would then

% git rebase -i HEAD~3 # or however many commits you want to squash
# then, follow the information in the link above and/or your editor window.

@typhonius
Copy link
Contributor Author

Thanks again for the clear instructions and sorry for drawing this out. I've followed them and squashed everything into the single commit.

@@ -10,7 +10,7 @@
## Script alias directives
<%# Combine scriptalais and scriptaliases into a single data structure -%>
<%# for backward compatibility and ease of implementation -%>
<%- aliases << { 'alias' => '/cgi-bin/', 'path' => @scriptalias } if @scriptalias -%>
<%- aliases << { 'alias' => '/cgi-bin', 'path' => @scriptalias } if @scriptalias -%>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The important thing here is really consistency. if you have a / in /cgi-bin, you should have a / in @scriptalias

@igalic
Copy link
Contributor

igalic commented Mar 3, 2014

No worries about how slow or fast things are moving! Our work is mostly to provide guidance so other people can contribute (:

igalic added a commit that referenced this pull request Mar 3, 2014
Added in mod_actions to the repo so it may be used.
@igalic igalic merged commit 58682fa into puppetlabs:master Mar 3, 2014
@igalic
Copy link
Contributor

igalic commented Mar 3, 2014

ran rspec spec/acceptance successfully, so let's hope nothing explodes.

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