Bug 3802/int/ensure apache conf fro 2.7 is added during migration #92
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…roperties into file in argument and permit to add Apache configuration of Rudder 2.7
|
Pull Request Updated ! |
|
Hmm...no. I have to use a better check for these new parameters |
| elif [ -d "/etc/httpd/conf.d" ];then | ||
| export WWW_DIR="/etc/httpd/conf.d" | ||
| else | ||
| echo "ERROR: There is not Apache configuration file" |
There was a problem hiding this comment.
s/.../Could not find Apache configuration file
| if [ ${CHECK_OLD_API_RESTRICTION} -eq 1 ];then | ||
| echo -n "INFO: Remove old API restriction..." | ||
| ### Remove lines between '# NO access to the API unless you are localhost' and end tag '</Location>' | ||
| sed -i "/^[ \t]*# NO access to the API unless you are localhost/,/^[ \t]*<\/Location>/d" ${RUDDER_WWW_CONF} |
There was a problem hiding this comment.
Isn't there a risk that this will eat several Location blocks?
There was a problem hiding this comment.
No risk, it will stop at the first
| </LocationMatch> | ||
| " | perl -p0e "s/\n/\\\n/g" | perl -p0e "s/\t/\\\t/g") | ||
| ### Use sed to add them at the end but before the end of 'VirtualHost' tag | ||
| sed -i "s@^[ \t]*\(</VirtualHost>\)@${NEW_API_CONF_ONELINER}\1@" ${RUDDER_WWW_CONF} |
There was a problem hiding this comment.
Same as above, capture the spaces/tabs for restoring old /VirtualHost line
…he configuration is found and use single quote in order to prevent some evil interpretations
| # - 2.7.0 : Apache configuration migration to add link to User Manual | ||
| CHECK_USER_MANUAL=$(grep "^\s*Alias /rudder-doc /usr/share/doc/rudder/html\s*$" ${RUDDER_WWW_CONF} | wc -l) | ||
| if [ ${CHECK_USER_MANUAL} -ne 1 ];then | ||
| echo -n "INFO: Adding User Manual configuration..." |
There was a problem hiding this comment.
Actually I think this isn't very clear. You can't usually configure a User manual. I suggest "Adding Apache alias for User Manual..."
jooooooon
added a commit
that referenced
this pull request
Jul 31, 2013
…ro_2.7_is_added_during_migration Bug 3802/int/ensure apache conf fro 2.7 is added during migration
nperron
deleted the
bug_3802/int/ensure_apache_conf_fro_2.7_is_added_during_migration
branch
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.