openstack/devstack
Code Issues Proposed changes

Merge "Remove change_apache_user_group function"

Browse Source
This commit is contained in:
Jenkins 2013-09-23 16:30:41 +00:00 committed by Gerrit Code Review
commit e4bf7fd239
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/apache
View File

@ -4,7 +4,6 @@
# Dependencies: # Dependencies:
# ``functions`` file # ``functions`` file
# is_apache_enabled_service # is_apache_enabled_service
# change_apache_user_group
# install_apache_wsgi # install_apache_wsgi
# config_apache_wsgi # config_apache_wsgi
# start_apache_server # start_apache_server
@ -52,29 +51,6 @@ function is_apache_enabled_service() {
return 1 return 1
} }
# change_apache_user_group() - Change the User/Group to run Apache server
function change_apache_user_group(){
local stack_user=$@
if is_ubuntu; then
sudo sed -e "
s/^export APACHE_RUN_USER=.*/export APACHE_RUN_USER=${stack_user}/g;
s/^export APACHE_RUN_GROUP=.*/export APACHE_RUN_GROUP=${stack_user}/g
" -i /etc/${APACHE_NAME}/envvars
elif is_fedora; then
sudo sed -e "
s/^User .*/User ${stack_user}/g;
s/^Group .*/Group ${stack_user}/g
" -i /etc/${APACHE_NAME}/httpd.conf
elif is_suse; then
sudo sed -e "
s/^User .*/User ${stack_user}/g;
s/^Group .*/Group ${stack_user}/g
" -i /etc/${APACHE_NAME}/uid.conf
else
exit_distro_not_supported "apache user and group"
fi
}
# install_apache_wsgi() - Install Apache server and wsgi module # install_apache_wsgi() - Install Apache server and wsgi module
function install_apache_wsgi() { function install_apache_wsgi() {
# Apache installation, because we mark it NOPRIME # Apache installation, because we mark it NOPRIME

7
lib/swift
View File

@ -203,9 +203,6 @@ function _config_swift_apache_wsgi() {
done done
# run apache server as stack user
change_apache_user_group ${STACK_USER}
# WSGI isn't enabled by default, enable it # WSGI isn't enabled by default, enable it
! is_fedora && sudo a2enmod wsgi ! is_fedora && sudo a2enmod wsgi
} }
@ -562,10 +559,6 @@ function start_swift() {
fi fi
if is_apache_enabled_service swift; then if is_apache_enabled_service swift; then
# Make sure the apache lock dir is owned by $STACK_USER
# for running apache server to avoid failure of restarting
# apache server due to permission problem.
sudo chown -R $STACK_USER /var/run/lock/$APACHE_NAME
restart_apache_server restart_apache_server
swift-init --run-dir=${SWIFT_DATA_DIR}/run rest start swift-init --run-dir=${SWIFT_DATA_DIR}/run rest start
screen_it s-proxy "cd $SWIFT_DIR && sudo tail -f /var/log/$APACHE_NAME/proxy-server" screen_it s-proxy "cd $SWIFT_DIR && sudo tail -f /var/log/$APACHE_NAME/proxy-server"