Browse code

Fix Apache Site configuration for openSUSE

We can use the mechnism as on Fedora for openSUSE.

Change-Id: Ic0d1734df3bdc9ec66e1592109b2d3770d6e0144

Ralf Haferkamp authored on 2014/06/16 21:10:05
Showing 1 changed files
... ...
@@ -90,7 +90,7 @@ function install_apache_wsgi {
90 90
 # /etc/apache2/sites-available/. a2ensite and a2dissite need the entire file name to work. The default
91 91
 # sites' files are default and default-ssl.
92 92
 #
93
-# On Fedora, any file in /etc/httpd/conf.d/ whose name ends with .conf is enabled.
93
+# On Fedora and openSUSE, any file in /etc/httpd/conf.d/ whose name ends with .conf is enabled.
94 94
 #
95 95
 # On RHEL and CentOS, things should hopefully work as in Fedora.
96 96
 #
... ...
@@ -113,7 +113,7 @@ function apache_site_config_for {
113 113
             # Ubuntu 14.04 - Apache 2.4
114 114
             echo $APACHE_CONF_DIR/${site}.conf
115 115
         fi
116
-    elif is_fedora; then
116
+    elif is_fedora || is_suse; then
117 117
         # fedora conf.d is only imported if it ends with .conf so this is approx the same
118 118
         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
119 119
         if [ -f $enabled_site_file ]; then
... ...
@@ -129,7 +129,7 @@ function enable_apache_site {
129 129
     local site=$@
130 130
     if is_ubuntu; then
131 131
         sudo a2ensite ${site}
132
-    elif is_fedora; then
132
+    elif is_fedora || is_suse; then
133 133
         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
134 134
         # Do nothing if site already enabled or no site config exists
135 135
         if [[ -f ${enabled_site_file}.disabled ]] && [[ ! -f ${enabled_site_file} ]]; then
... ...
@@ -143,7 +143,7 @@ function disable_apache_site {
143 143
     local site=$@
144 144
     if is_ubuntu; then
145 145
         sudo a2dissite ${site}
146
-    elif is_fedora; then
146
+    elif is_fedora || is_suse; then
147 147
         local enabled_site_file="$APACHE_CONF_DIR/${site}.conf"
148 148
         # Do nothing if no site config exists
149 149
         if [[ -f ${enabled_site_file} ]]; then