Cosmetic change for APACHE Configuration under Gentoo.

d3llf · d3llf · commit dc7e8b341f70 · 2012-10-31T20:52:29.000+01:00
If GLANCE_BIN_DIR is unset earlier, under if is interpreted as local
variable.
diff --git a/lib/glance b/lib/glance
@@ -28,6 +28,7 @@ set +o xtrace
 
 # Set up default directories
 GLANCE_DIR=$DEST/glance
+GLANCE_BIN_DIR=$GLANCE_DIR/bin
 GLANCECLIENT_DIR=$DEST/python-glanceclient
 GLANCE_CACHE_DIR=${GLANCE_CACHE_DIR:=$DATA_DIR/glance/cache}
 GLANCE_IMAGE_DIR=${GLANCE_IMAGE_DIR:=$DATA_DIR/glance/images}
diff --git a/stack.sh b/stack.sh
@@ -1181,7 +1181,7 @@ if is_service_enabled horizon; then
 	APACHE_CONF=vhosts.d/horizon.conf
 	sudo touch /etc/$APACHE_NAME/$APACHE_CONF
 	# Enable WSGI for Apache if it's not enabled.
-	grep -E "^APACHE2_OPTS=\".*-D WSGI.*$" /etc/conf.d/apache2 ||
+	grep -E "^APACHE2_OPTS=\".*-D WSGI.*$" /etc/conf.d/apache2 >/dev/null ||
 	sudo sed -i 's/APACHE2_OPTS="/APACHE2_OPTS="-D WSGI /g' /etc/conf.d/apache2
     fi
 
