Browse code

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

Vincent Untz authored on 2012/12/05 02:34:25
Showing 2 changed files
... ...
@@ -79,7 +79,7 @@ function init_horizon() {
79 79
         # Be a good citizen and use the distro tools here
80 80
         sudo touch /etc/$APACHE_NAME/$APACHE_CONF
81 81
         sudo a2ensite horizon
82
-        # WSGI doesn't enable by default, enable it
82
+        # WSGI isn't enabled by default, enable it
83 83
         sudo a2enmod wsgi
84 84
     elif is_fedora; then
85 85
         APACHE_NAME=httpd
... ...
@@ -88,9 +88,8 @@ function init_horizon() {
88 88
     elif is_suse; then
89 89
         APACHE_NAME=apache2
90 90
         APACHE_CONF=vhosts.d/horizon.conf
91
-        # Append wsgi to the list of modules to load
92
-        grep -q "^APACHE_MODULES=.*wsgi" /etc/sysconfig/apache2 ||
93
-            sudo sed '/^APACHE_MODULES=/s/^\(.*\)"$/\1 wsgi"/' -i /etc/sysconfig/apache2
91
+        # WSGI isn't enabled by default, enable it
92
+        sudo a2enmod wsgi
94 93
     else
95 94
         exit_distro_not_supported "apache configuration"
96 95
     fi
... ...
@@ -92,6 +92,8 @@ if is_ubuntu; then
92 92
     PKG_DIR=$FILES/apts
93 93
 elif is_fedora; then
94 94
     PKG_DIR=$FILES/rpms
95
+elif is_suse; then
96
+    PKG_DIR=$FILES/rpms-suse
95 97
 else
96 98
     exit_distro_not_supported "list of packages"
97 99
 fi