From: Tom Hughes <tom@compton.nu>
Date: Sun, 18 Jan 2015 21:42:44 +0000 (+0000)
Subject: Remove some no longer needed Ubuntu 12.04 compatibility code
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c05f38004a026509d99b5f2350bfeb021e44fc42

Remove some no longer needed Ubuntu 12.04 compatibility code
---

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index b37ec1b0c..0c9dd3f3c 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/templates/default/apache.erb
@@ -48,9 +48,7 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all granted
-<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -60,12 +58,7 @@
     AllowOverride None
     AddType text/plain .html .htm .shtml
 <% if @mediawiki[:private] -%>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
 <% end -%>
   </Directory>
 
@@ -90,21 +83,11 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Files>
 
   <Directory <%= @mediawiki[:directory] %>/cache/>
@@ -115,30 +98,15 @@
   </Directory>
 
   <Directory ~ "\.svn">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Directory ~ "\.git">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Files ~ "~$">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Files>
 </VirtualHost>
 <% if @mediawiki[:enable_ssl] -%>
@@ -192,9 +160,7 @@
 
   <Directory <%= @directory %>>
     Options -Indexes
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all granted
-<% end -%>
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -203,12 +169,7 @@
     Options -ExecCGI -Includes -Indexes
     AllowOverride None
 <% if @mediawiki[:private] -%>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
 <% end -%>
   </Directory>
 
@@ -225,21 +186,11 @@
   </Directory>
 
   <Directory <%= @mediawiki[:directory] %>/maintenance/>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Files <%= @mediawiki[:directory] %>/LocalSettings.php>
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Files>
 
   <Directory <%= @mediawiki[:directory] %>/images/>
@@ -257,30 +208,15 @@
   </Directory>
 
   <Directory ~ "\.svn">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Directory ~ "\.git">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Directory>
 
   <Files ~ "~$">
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Require all denied
-<% else -%>
-    Order allow,deny
-    Deny from all
-<% end -%>
   </Files>
 </VirtualHost>
 <% end -%>
diff --git a/cookbooks/nginx/templates/default/nginx.conf.erb b/cookbooks/nginx/templates/default/nginx.conf.erb
index c16aa9650..398cefff9 100644
--- a/cookbooks/nginx/templates/default/nginx.conf.erb
+++ b/cookbooks/nginx/templates/default/nginx.conf.erb
@@ -1,10 +1,6 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
-  user  www-data;
-<% else -%>
-  user  nginx;
-<% end -%>
+user  www-data;
 worker_processes <%= node['cpu']['total'] %>;
 
 error_log  /var/log/nginx/error.log warn;
diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 3490d91e1..ebcc5d783 100644
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -29,13 +29,8 @@ package "php-pear"
 package "php-apc"
 
 apache_module "rewrite"
-
-if node[:lsb][:release].to_f >= 14.04
-  apache_module "proxy"
-  apache_module "proxy_fcgi"
-else
-  apache_module "fastcgi-handler"
-end
+apache_module "proxy"
+apache_module "proxy_fcgi"
 
 home_directory = data_bag_item("accounts", "nominatim")["home"]
 source_directory = "#{home_directory}/nominatim"
@@ -48,9 +43,7 @@ database_name = node[:nominatim][:database][:dbname]
 postgis_version = node[:nominatim][:database][:postgis]
 
 service "php5-fpm" do
-  if node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
+  provider Chef::Provider::Service::Upstart
   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
 end
diff --git a/cookbooks/nominatim/templates/default/apache.erb b/cookbooks/nominatim/templates/default/apache.erb
index be0e48a59..230063643 100644
--- a/cookbooks/nominatim/templates/default/apache.erb
+++ b/cookbooks/nominatim/templates/default/apache.erb
@@ -25,43 +25,21 @@
     <Directory "<%= @directory %>/website/">
         DirectoryIndex search.php
         Options FollowSymLinks
-<% if node[:lsb][:release].to_f >= 14.04 -%>
         Require all granted
-<% end -%>
     </Directory>
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     ProxyPassMatch ^/([^/]*\.php(/.*)?)$ fcgi://127.0.0.1:<%= @pools[:www][:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch ^/([^/]*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-www.sock
-    </LocationMatch>
-<% end -%>
 
     <% @pools.each do |name,details| -%>
     Alias /pool-<%= name %>/ "<%= @directory %>/website/"
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     ProxyPassMatch ^/pool-<%= name %>/(.*\.php(/.*)?) fcgi://127.0.0.1:<%= details[:port ]%><%= @directory %>/website/$1
-<% else -%>
-    <LocationMatch ^/pool-<%= name %>/(.*\.php(/.*)?)$>
-        SetHandler fcgi:/var/run/php5-fpm-<%= name %>.sock
-    </LocationMatch>
-<% end -%>
     <% end -%>
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
     Redirect 429 /pool-block/
     ErrorDocument 429 /509.html
     <Location /pool-block>
         ErrorDocument 429 /509.html
     </Location>
-<% else -%>
-    Redirect 420 /pool-block/
-    ErrorDocument 420 /509.html
-    <Location /pool-block>
-        ErrorDocument 420 /509.html
-    </Location>
-<% end -%>
     Redirect 403 /pool-ban/
     <Location /pool-ban>
         ErrorDocument 403 /403.html
diff --git a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
index 5e2caae28..a14042e47 100644
--- a/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
+++ b/cookbooks/nominatim/templates/default/logrotate.nominatim.erb
@@ -19,16 +19,3 @@
   notifempty
   create 640 www-data adm
 }
-<% if node[:lsb][:release].to_f < 14.04 -%>
-
-/var/log/php5-fpm.log {
-  weekly
-  missingok
-  rotate 3
-  compress
-  delaycompress
-  postrotate
-    /usr/bin/service php5-fpm restart > /dev/null
-  endscript
-}
-<% end -%>
diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 3fb9fcf89..4855a1912 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -41,10 +41,8 @@ directory "/etc/squid/squid.conf.d" do
 end
 
 service "squid" do
-  if node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
-   action [ :enable, :start ]
+  provider Chef::Provider::Service::Upstart
+  action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
   subscribes :reload, "template[/etc/squid/squid.conf]"
   subscribes :restart, "template[/etc/default/squid]"