From f2a18c065e2447083e874eeae59bf6988491ae3f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 4 Dec 2012 18:34:25 +0100 Subject: [PATCH] Two small fixes for openSUSE support - Use right package files for openSUSE in tools/info.sh - Use a2enmod to enable the wsgi apache module Change-Id: I51e3019be32dc0938674c9c8d285a55f5b023707 --- lib/horizon | 7 +++---- tools/info.sh | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/horizon b/lib/horizon index 68337ab802..5d479d5d95 100644 --- a/lib/horizon +++ b/lib/horizon @@ -79,7 +79,7 @@ function init_horizon() { # Be a good citizen and use the distro tools here sudo touch /etc/$APACHE_NAME/$APACHE_CONF sudo a2ensite horizon - # WSGI doesn't enable by default, enable it + # WSGI isn't enabled by default, enable it sudo a2enmod wsgi elif is_fedora; then APACHE_NAME=httpd @@ -88,9 +88,8 @@ function init_horizon() { elif is_suse; then APACHE_NAME=apache2 APACHE_CONF=vhosts.d/horizon.conf - # Append wsgi to the list of modules to load - grep -q "^APACHE_MODULES=.*wsgi" /etc/sysconfig/apache2 || - sudo sed '/^APACHE_MODULES=/s/^\(.*\)"$/\1 wsgi"/' -i /etc/sysconfig/apache2 + # WSGI isn't enabled by default, enable it + sudo a2enmod wsgi else exit_distro_not_supported "apache configuration" fi diff --git a/tools/info.sh b/tools/info.sh index f01dbea0cb..ef1f3380e2 100755 --- a/tools/info.sh +++ b/tools/info.sh @@ -92,6 +92,8 @@ if is_ubuntu; then PKG_DIR=$FILES/apts elif is_fedora; then PKG_DIR=$FILES/rpms +elif is_suse; then + PKG_DIR=$FILES/rpms-suse else exit_distro_not_supported "list of packages" fi