openstack/devstack
Code Issues Proposed changes

Merge "Make a2dissite fail softly if the site is not enabled"

Browse Source
This commit is contained in:
Jenkins 2017-04-19 06:34:20 +00:00 committed by Gerrit Code Review
commit 4b9022ddd7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/apache
View File

@ -186,7 +186,7 @@ function enable_apache_site {
function disable_apache_site { function disable_apache_site {
local site=$@ local site=$@
if is_ubuntu; then if is_ubuntu; then
sudo a2dissite ${site} sudo a2dissite ${site} || true
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
local enabled_site_file="$APACHE_CONF_DIR/${site}.conf" local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
# Do nothing if no site config exists # Do nothing if no site config exists