replication for nominatim servers

[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 7d45abe214ac1d3909b4f49bd478286b270d27c4..7301fd83415761ed75b199413d085b2a5cbe7d0d 100644 (file)
--- a/cookbooks/dev/templates/default/apache.rails.erb
+++ b/cookbooks/dev/templates/default/apache.rails.erb
@@ -1,16 +1,30 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>
 # DO NOT EDIT - This file is being maintained by Chef
 
 <VirtualHost *:80>

-       ServerName <%= @name %>
+        ServerName <%= @name %>

 <% @aliases.each do |alias_name| -%>
 <% @aliases.each do |alias_name| -%>

-       ServerAlias <%= alias_name %>
+        ServerAlias <%= alias_name %>

 <% end -%>
 <% end -%>

-       ServerAdmin webmaster@openstreetmap.org
+        ServerAdmin webmaster@openstreetmap.org

 
 

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

 
 

-       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

 
 

-       RailsEnv production
+        RailsEnv production
+
+        SetEnv SECRET_KEY_BASE <%= @secret_key_base %>

 </VirtualHost>
 </VirtualHost>

+
+<Directory /srv/<%= @name %>/public>
+        Require all granted
+</Directory>
+
+<Directory /srv/<%= @name %>/app/assets>
+        Require all granted
+</Directory>
+
+<Directory /srv/<%= @name %>/vendor/assets>
+        Require all granted
+</Directory>