tilecache: specify correct token key encoding

[chef.git] / cookbooks / wordpress / templates / default / apache.erb

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 90adc23a29c6ae908af45fdb3a9b36d3ed3aed28..200c500894c285c1a0743e4fe7c306c07d432990 100644 (file)
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -11,25 +11,32 @@
   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
 

-

 <% if @ssl_enabled -%>
 <% if @ssl_enabled -%>

-    RedirectPermanent / https://<%= @name %>/
-  </VirtualHost>
-  <VirtualHost *:443>
-    ServerName <%= @name %>
-  <% @aliases.each do |alias_name| -%>
-    ServerAlias <%= alias_name %>
-  <% end -%>
-
-    ServerAdmin webmaster@openstreetmap.org
-
-    #
-    # Enable SSL
-    #
-    SSLEngine on
-
-    CustomLog /var/log/apache2/<%= @name %>-access.log combined
-    ErrorLog /var/log/apache2/<%= @name %>-error.log
+  RedirectPermanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+  ServerName <%= @name %>
+<% @aliases.each do |alias_name| -%>
+  ServerAlias <%= alias_name %>
+<% end -%>
+
+  ServerAdmin webmaster@openstreetmap.org
+
+  #
+  # Enable SSL
+  #
+  SSLEngine on
+<% if @ssl_certificate -%>
+  SSLCertificateFile /etc/ssl/certs/<%= @ssl_certificate %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @ssl_certificate %>.key
+<% end -%>
+<% if @ssl_certificate -%>
+  SSLCertificateChainFile /etc/ssl/certs/<%= @ssl_certificate_chain %>.pem
+<% end -%>
+
+  CustomLog /var/log/apache2/<%= @name %>-access.log combined
+  ErrorLog /var/log/apache2/<%= @name %>-error.log

 <% end -%>
 
   DocumentRoot <%= @directory %>
 <% end -%>
 
   DocumentRoot <%= @directory %>


@@ -50,15 +57,19 @@
     RewriteRule ^wp-includes/[^/]+\.php$ - [F,L]
     RewriteRule ^wp-includes/js/tinymce/langs/.+\.php - [F,L]
     RewriteRule ^wp-includes/theme-compat/ - [F,L]
     RewriteRule ^wp-includes/[^/]+\.php$ - [F,L]
     RewriteRule ^wp-includes/js/tinymce/langs/.+\.php - [F,L]
     RewriteRule ^wp-includes/theme-compat/ - [F,L]

+    RewriteRule ^readme\.html$ [F,L]

     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule . /index.php [L]

+

     Options -Indexes
     Options -Indexes

+    AllowOverride AuthConfig
+
+    Require all granted

   </Directory>
 
   <Files <%= @directory %>/wp-config.php>
   </Directory>
 
   <Files <%= @directory %>/wp-config.php>

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 
   <Directory <%= @directory %>/uploads>
   </Files>
 
   <Directory <%= @directory %>/uploads>


@@ -68,17 +79,18 @@
   </Directory>
 
   <Directory ~ "\.svn">
   </Directory>
 
   <Directory ~ "\.svn">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   <Directory ~ "\.git">
   </Directory>
 
   <Directory ~ "\.git">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Directory>
 
   </Directory>
 

+  <Files ~ "\.(txt|md)$">
+    Require all denied
+  </Files>
+

   <Files ~ "~$">
   <Files ~ "~$">

-    Order allow,deny
-    Deny from all
+    Require all denied

   </Files>
 </VirtualHost>
   </Files>
 </VirtualHost>