Merge "Turn off Nova firewall driver when using Neutron"
diff --git a/lib/horizon b/lib/horizon
index af0db49..c116ec2 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -120,6 +120,11 @@
# Be a good citizen and use the distro tools here
sudo touch $horizon_conf
sudo a2ensite horizon.conf
+ if [[ "$DISTRO" == "saucy" ]]; then
+ # Ubuntu 13.10 has Require all denied in apache2.conf
+ # and requires explicit Require all granted
+ HORIZON_REQUIRE='Require all granted'
+ fi
elif is_fedora; then
if [[ "$os_RELEASE" -ge "18" ]]; then
# fedora 18 has Require all denied in its httpd.conf
diff --git a/lib/keystone b/lib/keystone
old mode 100755
new mode 100644
index 7011f66..4353eba
--- a/lib/keystone
+++ b/lib/keystone
@@ -126,6 +126,7 @@
if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then
cp -p $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
+ chmod 600 $KEYSTONE_CONF
cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR
if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then
cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI"