openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Configure horizon when using /etc/apache2."

Browse Source
This commit is contained in:
Jenkins 2014-02-25 08:43:08 +00:00 committed by Gerrit Code Review
commit ad868bfe27
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elements/apache2/os-refresh-config/post-configure.d/15-apache2
View File

@ -33,8 +33,9 @@ if [ -f /etc/debian_version ]; then
fi fi
# Pick up on any config changes other elements may have done # Pick up on any config changes other elements may have done
# if service is not running reload isnt sufficient, so restart
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
service apache2 reload service apache2 reload || service apache2 restart
elif [ -f /etc/yum.conf ]; then elif [ -f /etc/yum.conf ]; then
service httpd reload service httpd reload || service httpd restart
fi fi

4
elements/horizon/install.d/horizon-source-install/100-horizon
View File

@ -5,7 +5,9 @@ install-packages libapache2-mod-wsgi
if [ -d /etc/apache2 ]; then if [ -d /etc/apache2 ]; then
ln -s /etc/httpd/conf.d/horizon.conf /etc/apache2/sites-available/horizon.conf ln -s /etc/httpd/conf.d/horizon.conf /etc/apache2/sites-available/horizon.conf
ln -s /etc/httpd/sites-available/horizon.conf /etc/apache2/sites-enabled/horizon.conf ln -s /etc/httpd/conf.d/horizon.conf /etc/apache2/sites-enabled/horizon.conf
ln -s /var/log/apache2 /var/log/httpd
rm -f /etc/apache2/sites-enabled/{000-default.conf,default.conf,default-ssl.conf}
fi fi
os-svc-install -n horizon -u horizon -r /opt/stack/horizon os-svc-install -n horizon -u horizon -r /opt/stack/horizon