openstack/devstack
Code Issues Proposed changes

Merge "use disable/enable_apache_site on Ubuntu"

Browse Source
This commit is contained in:
Jenkins 2014-04-05 11:07:48 +00:00 committed by Gerrit Code Review
commit 87c0c263a0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/horizon
View File

@ -114,11 +114,9 @@ function init_horizon {
local horizon_conf=/etc/$APACHE_NAME/$APACHE_CONF_DIR/horizon.conf local horizon_conf=/etc/$APACHE_NAME/$APACHE_CONF_DIR/horizon.conf
if is_ubuntu; then if is_ubuntu; then
# Clean up the old config name disable_apache_site 000-default
sudo rm -f /etc/apache2/sites-enabled/000-default
# Be a good citizen and use the distro tools here
sudo touch $horizon_conf sudo touch $horizon_conf
sudo a2ensite horizon.conf enable_apache_site horizon.conf
elif is_fedora; then elif is_fedora; then
sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf
elif is_suse; then elif is_suse; then