Browse code

Merge "Fix apache horizon permissions on Ubuntu 13.10"

Jenkins authored on 2013/11/02 03:32:05
Showing 1 changed files
... ...
@@ -120,6 +120,11 @@ function init_horizon() {
120 120
         # Be a good citizen and use the distro tools here
121 121
         sudo touch $horizon_conf
122 122
         sudo a2ensite horizon.conf
123
+        if [[ "$DISTRO" == "saucy" ]]; then
124
+            # Ubuntu 13.10 has Require all denied in apache2.conf
125
+            # and requires explicit Require all granted
126
+            HORIZON_REQUIRE='Require all granted'
127
+        fi
123 128
     elif is_fedora; then
124 129
         if [[ "$os_RELEASE" -ge "18" ]]; then
125 130
             # fedora 18 has Require all denied  in its httpd.conf