Merge remote-tracking branch 'github/pull/193'

[chef.git] / cookbooks / dev / templates / default / apache.rails.erb

diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb
index e431cf1a1cb49d1a84fc6fc73f1e630bb1e73fc4..ab9cffbad0be23cb3d3d08803312b0aa07552a43 100644 (file)
--- a/cookbooks/dev/templates/default/apache.rails.erb
+++ b/cookbooks/dev/templates/default/apache.rails.erb
@@ -14,15 +14,38 @@
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 
         CustomLog /var/log/apache2/<%= @name %>-access.log combined
         ErrorLog /var/log/apache2/<%= @name %>-error.log
 

-        DocumentRoot /srv/<%= @name %>/public
+        DocumentRoot /srv/<%= @name %>/rails/public

 
         RailsEnv production
 
         RailsEnv production

+        PassengerAppGroupName <%= @application_name %>

 
         SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
         # Ensure robots do not index dev site
         # https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
         Header set X-Robots-Tag "noindex, nofollow"
 
         SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
         # Ensure robots do not index dev site
         # https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
         Header set X-Robots-Tag "noindex, nofollow"

+
+        # Force special MIME type for crossdomain.xml files
+        <Files crossdomain.xml>
+                ForceType text/x-cross-domain-policy
+        </Files>
+<% if @cgimap_enabled -%>
+
+        # Pass authentication related headers to cgimap
+        <Location />
+                CGIPassAuth On
+        </Location>
+
+        # Pass supported calls to cgimap
+        RewriteEngine on
+        RewriteRule ^/api/0\.6/map$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+        RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
+        RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+        RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+        RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+        RewriteRule ^/api/0\.6/(nodes|ways|relations)$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+        RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)$ fcgi://127.0.0.1:<%= @cgimap_port %>$0 [P]
+<% end -%>

 </VirtualHost>
 
 <VirtualHost *:80>
 </VirtualHost>
 
 <VirtualHost *:80>


@@ -43,14 +66,14 @@
         Header set X-Robots-Tag "noindex, nofollow"
 </VirtualHost>
 
         Header set X-Robots-Tag "noindex, nofollow"
 </VirtualHost>
 

-<Directory /srv/<%= @name %>/public>
+<Directory /srv/<%= @name %>/rails/public>

         Require all granted
 </Directory>
 
         Require all granted
 </Directory>
 

-<Directory /srv/<%= @name %>/app/assets>
+<Directory /srv/<%= @name %>/rails/app/assets>

         Require all granted
 </Directory>
 
         Require all granted
 </Directory>
 

-<Directory /srv/<%= @name %>/vendor/assets>
+<Directory /srv/<%= @name %>/rails/vendor/assets>

         Require all granted
 </Directory>
         Require all granted
 </Directory>