openstack/devstack
Code Issues Proposed changes

Merge "Always restart apache"

Browse Source
This commit is contained in:
Jenkins 2017-04-27 08:35:01 +00:00 committed by Gerrit Code Review
commit a292c5068c
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/apache
View File

@ -218,11 +218,6 @@ function restart_apache_server {
restart_service $APACHE_NAME
}
# reload_apache_server
function reload_apache_server {
reload_service $APACHE_NAME
}
function write_uwsgi_config {
local file=$1
local wsgi=$2
@ -267,7 +262,7 @@ function write_uwsgi_config {
apache_conf=$(apache_site_config_for $name)
echo "ProxyPass \"${url}\" \"unix:${socket}|uwsgi://uwsgi-uds-${name}/\" retry=0 " | sudo tee $apache_conf
enable_apache_site $name
reload_apache_server
restart_apache_server
fi
}

7
lib/tls
View File

@ -526,12 +526,7 @@ EOF
enable_apache_mod $mod
done
enable_apache_site $b_service
# Only a reload is required to pull in new vhosts
# Note that a restart reliably fails on centos7 and trusty
# because apache can't open port 80 because the old apache
# still has it open. Using reload fixes trusty but centos7
# still doesn't work.
reload_apache_server
restart_apache_server
}
# Follow TLS proxy