From a60f8a522d3ab47b49ba10b4c5cb756e5785ef58 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 9 Sep 2019 22:08:23 +0100 Subject: [PATCH 1/1] Remove no longer requried foodcritic customisations --- cookbooks/accounts/.foodcritic | 6 ------ cookbooks/apache/.foodcritic | 5 ----- cookbooks/apache/resources/module.rb | 2 +- cookbooks/apt/.foodcritic | 6 ------ cookbooks/backup/.foodcritic | 5 ----- cookbooks/bind/.foodcritic | 5 ----- cookbooks/blog/.foodcritic | 5 ----- cookbooks/blogs/.foodcritic | 6 ------ cookbooks/cgiirc/.foodcritic | 5 ----- cookbooks/chef/.foodcritic | 5 ----- cookbooks/civicrm/.foodcritic | 5 ----- cookbooks/clamav/.foodcritic | 5 ----- cookbooks/db/.foodcritic | 5 ----- cookbooks/dev/.foodcritic | 6 ------ cookbooks/devices/.foodcritic | 5 ----- cookbooks/dhcpd/.foodcritic | 5 ----- cookbooks/dmca/.foodcritic | 5 ----- cookbooks/dns/.foodcritic | 5 ----- cookbooks/donate/.foodcritic | 6 ------ cookbooks/elasticsearch/.foodcritic | 5 ----- cookbooks/exim/.foodcritic | 6 ------ cookbooks/exim/recipes/default.rb | 2 +- cookbooks/fail2ban/.foodcritic | 5 ----- cookbooks/forum/.foodcritic | 5 ----- cookbooks/foundation/.foodcritic | 5 ----- cookbooks/ftp/.foodcritic | 5 ----- cookbooks/geodns/.foodcritic | 5 ----- cookbooks/git/.foodcritic | 6 ------ cookbooks/gps-tile/.foodcritic | 5 ----- cookbooks/hardware/.foodcritic | 5 ----- cookbooks/hot/.foodcritic | 5 ----- cookbooks/imagery/.foodcritic | 6 ------ cookbooks/incron/.foodcritic | 5 ----- cookbooks/kibana/.foodcritic | 6 ------ cookbooks/letsencrypt/.foodcritic | 6 ------ cookbooks/logstash/.foodcritic | 7 ------- cookbooks/logstash/recipes/default.rb | 4 ++-- cookbooks/mailman/.foodcritic | 5 ----- cookbooks/mediawiki/.foodcritic | 6 ------ cookbooks/mediawiki/resources/extension.rb | 2 +- cookbooks/mediawiki/resources/site.rb | 4 ++-- cookbooks/mediawiki/resources/skin.rb | 2 +- cookbooks/memcached/.foodcritic | 5 ----- cookbooks/munin/.foodcritic | 7 ------- cookbooks/munin/recipes/default.rb | 4 ++-- cookbooks/munin/recipes/server.rb | 6 +++--- cookbooks/munin/resources/plugin.rb | 4 ++-- cookbooks/mysql/.foodcritic | 5 ----- cookbooks/networking/.foodcritic | 7 ------- cookbooks/networking/recipes/default.rb | 2 +- cookbooks/nfs/.foodcritic | 6 ------ cookbooks/nginx/.foodcritic | 5 ----- cookbooks/nodejs/.foodcritic | 5 ----- cookbooks/nominatim/.foodcritic | 6 ------ cookbooks/nominatim/recipes/default.rb | 4 ++-- cookbooks/ntp/.foodcritic | 5 ----- cookbooks/ohai/.foodcritic | 5 ----- cookbooks/openssh/.foodcritic | 6 ------ cookbooks/openssh/recipes/default.rb | 14 +++++++------- cookbooks/openvpn/.foodcritic | 6 ------ cookbooks/osmosis/.foodcritic | 5 ----- cookbooks/osqa/.foodcritic | 5 ----- cookbooks/otrs/.foodcritic | 5 ----- cookbooks/passenger/.foodcritic | 5 ----- cookbooks/piwik/.foodcritic | 5 ----- cookbooks/planet/.foodcritic | 5 ----- cookbooks/postgresql/.foodcritic | 5 ----- cookbooks/python/.foodcritic | 5 ----- cookbooks/roundup/.foodcritic | 5 ----- cookbooks/rsyncd/.foodcritic | 6 ------ cookbooks/serverinfo/.foodcritic | 5 ----- cookbooks/snmpd/.foodcritic | 5 ----- cookbooks/spamassassin/.foodcritic | 6 ------ cookbooks/squid/.foodcritic | 5 ----- cookbooks/ssl/.foodcritic | 6 ------ cookbooks/stateofthemap/.foodcritic | 5 ----- cookbooks/subversion/.foodcritic | 5 ----- cookbooks/supybot/.foodcritic | 5 ----- cookbooks/switch2osm/.foodcritic | 5 ----- cookbooks/sysctl/.foodcritic | 5 ----- cookbooks/sysfs/.foodcritic | 5 ----- cookbooks/systemd/.foodcritic | 4 ---- cookbooks/taginfo/.foodcritic | 5 ----- cookbooks/tile/.foodcritic | 6 ------ cookbooks/tilecache/.foodcritic | 6 ------ cookbooks/tilelog/.foodcritic | 5 ----- cookbooks/tools/.foodcritic | 5 ----- cookbooks/trac/.foodcritic | 5 ----- cookbooks/web/.foodcritic | 6 ------ cookbooks/wiki/.foodcritic | 5 ----- cookbooks/wordpress/.foodcritic | 6 ------ 91 files changed, 25 insertions(+), 447 deletions(-) delete mode 100644 cookbooks/accounts/.foodcritic delete mode 100644 cookbooks/apache/.foodcritic delete mode 100644 cookbooks/apt/.foodcritic delete mode 100644 cookbooks/backup/.foodcritic delete mode 100644 cookbooks/bind/.foodcritic delete mode 100644 cookbooks/blog/.foodcritic delete mode 100644 cookbooks/blogs/.foodcritic delete mode 100644 cookbooks/cgiirc/.foodcritic delete mode 100644 cookbooks/chef/.foodcritic delete mode 100644 cookbooks/civicrm/.foodcritic delete mode 100644 cookbooks/clamav/.foodcritic delete mode 100644 cookbooks/db/.foodcritic delete mode 100644 cookbooks/dev/.foodcritic delete mode 100644 cookbooks/devices/.foodcritic delete mode 100644 cookbooks/dhcpd/.foodcritic delete mode 100644 cookbooks/dmca/.foodcritic delete mode 100644 cookbooks/dns/.foodcritic delete mode 100644 cookbooks/donate/.foodcritic delete mode 100644 cookbooks/elasticsearch/.foodcritic delete mode 100644 cookbooks/exim/.foodcritic delete mode 100644 cookbooks/fail2ban/.foodcritic delete mode 100644 cookbooks/forum/.foodcritic delete mode 100644 cookbooks/foundation/.foodcritic delete mode 100644 cookbooks/ftp/.foodcritic delete mode 100644 cookbooks/geodns/.foodcritic delete mode 100644 cookbooks/git/.foodcritic delete mode 100644 cookbooks/gps-tile/.foodcritic delete mode 100644 cookbooks/hardware/.foodcritic delete mode 100644 cookbooks/hot/.foodcritic delete mode 100644 cookbooks/imagery/.foodcritic delete mode 100644 cookbooks/incron/.foodcritic delete mode 100644 cookbooks/kibana/.foodcritic delete mode 100644 cookbooks/letsencrypt/.foodcritic delete mode 100644 cookbooks/logstash/.foodcritic delete mode 100644 cookbooks/mailman/.foodcritic delete mode 100644 cookbooks/mediawiki/.foodcritic delete mode 100644 cookbooks/memcached/.foodcritic delete mode 100644 cookbooks/munin/.foodcritic delete mode 100644 cookbooks/mysql/.foodcritic delete mode 100644 cookbooks/networking/.foodcritic delete mode 100644 cookbooks/nfs/.foodcritic delete mode 100644 cookbooks/nginx/.foodcritic delete mode 100644 cookbooks/nodejs/.foodcritic delete mode 100644 cookbooks/nominatim/.foodcritic delete mode 100644 cookbooks/ntp/.foodcritic delete mode 100644 cookbooks/ohai/.foodcritic delete mode 100644 cookbooks/openssh/.foodcritic delete mode 100644 cookbooks/openvpn/.foodcritic delete mode 100644 cookbooks/osmosis/.foodcritic delete mode 100644 cookbooks/osqa/.foodcritic delete mode 100644 cookbooks/otrs/.foodcritic delete mode 100644 cookbooks/passenger/.foodcritic delete mode 100644 cookbooks/piwik/.foodcritic delete mode 100644 cookbooks/planet/.foodcritic delete mode 100644 cookbooks/postgresql/.foodcritic delete mode 100644 cookbooks/python/.foodcritic delete mode 100644 cookbooks/roundup/.foodcritic delete mode 100644 cookbooks/rsyncd/.foodcritic delete mode 100644 cookbooks/serverinfo/.foodcritic delete mode 100644 cookbooks/snmpd/.foodcritic delete mode 100644 cookbooks/spamassassin/.foodcritic delete mode 100644 cookbooks/squid/.foodcritic delete mode 100644 cookbooks/ssl/.foodcritic delete mode 100644 cookbooks/stateofthemap/.foodcritic delete mode 100644 cookbooks/subversion/.foodcritic delete mode 100644 cookbooks/supybot/.foodcritic delete mode 100644 cookbooks/switch2osm/.foodcritic delete mode 100644 cookbooks/sysctl/.foodcritic delete mode 100644 cookbooks/sysfs/.foodcritic delete mode 100644 cookbooks/systemd/.foodcritic delete mode 100644 cookbooks/taginfo/.foodcritic delete mode 100644 cookbooks/tile/.foodcritic delete mode 100644 cookbooks/tilecache/.foodcritic delete mode 100644 cookbooks/tilelog/.foodcritic delete mode 100644 cookbooks/tools/.foodcritic delete mode 100644 cookbooks/trac/.foodcritic delete mode 100644 cookbooks/web/.foodcritic delete mode 100644 cookbooks/wiki/.foodcritic delete mode 100644 cookbooks/wordpress/.foodcritic diff --git a/cookbooks/accounts/.foodcritic b/cookbooks/accounts/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/accounts/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/apache/.foodcritic b/cookbooks/apache/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/apache/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/apache/resources/module.rb b/cookbooks/apache/resources/module.rb index 7e45b78e2..0ac0f8f01 100644 --- a/cookbooks/apache/resources/module.rb +++ b/cookbooks/apache/resources/module.rb @@ -28,7 +28,7 @@ property :restart_apache, :kind_of => [TrueClass, FalseClass], :default => true action :install do declare_resource :package, package_name unless installed? - if new_resource.conf # ~FC023 + if new_resource.conf template available_name("conf") do source new_resource.conf owner "root" diff --git a/cookbooks/apt/.foodcritic b/cookbooks/apt/.foodcritic deleted file mode 100644 index 6f7140762..000000000 --- a/cookbooks/apt/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 -~FC074 diff --git a/cookbooks/backup/.foodcritic b/cookbooks/backup/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/backup/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/bind/.foodcritic b/cookbooks/bind/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/bind/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/blog/.foodcritic b/cookbooks/blog/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/blog/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/blogs/.foodcritic b/cookbooks/blogs/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/blogs/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/cgiirc/.foodcritic b/cookbooks/cgiirc/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/cgiirc/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/chef/.foodcritic b/cookbooks/chef/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/chef/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/civicrm/.foodcritic b/cookbooks/civicrm/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/civicrm/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/clamav/.foodcritic b/cookbooks/clamav/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/clamav/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/db/.foodcritic b/cookbooks/db/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/db/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/dev/.foodcritic b/cookbooks/dev/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/dev/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/devices/.foodcritic b/cookbooks/devices/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/devices/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/dhcpd/.foodcritic b/cookbooks/dhcpd/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/dhcpd/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/dmca/.foodcritic b/cookbooks/dmca/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/dmca/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/dns/.foodcritic b/cookbooks/dns/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/dns/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/donate/.foodcritic b/cookbooks/donate/.foodcritic deleted file mode 100644 index 15ed978ff..000000000 --- a/cookbooks/donate/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC034 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/elasticsearch/.foodcritic b/cookbooks/elasticsearch/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/elasticsearch/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/exim/.foodcritic b/cookbooks/exim/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/exim/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index 7c80f9a0d..94133183a 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -156,7 +156,7 @@ else end end -if node[:exim][:smarthost_via] # ~FC023 +if node[:exim][:smarthost_via] firewall_rule "deny-outbound-smtp" do action :reject source "fw" diff --git a/cookbooks/fail2ban/.foodcritic b/cookbooks/fail2ban/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/fail2ban/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/forum/.foodcritic b/cookbooks/forum/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/forum/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/foundation/.foodcritic b/cookbooks/foundation/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/foundation/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/ftp/.foodcritic b/cookbooks/ftp/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/ftp/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/geodns/.foodcritic b/cookbooks/geodns/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/geodns/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/git/.foodcritic b/cookbooks/git/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/git/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/gps-tile/.foodcritic b/cookbooks/gps-tile/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/gps-tile/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/hardware/.foodcritic b/cookbooks/hardware/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/hardware/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/hot/.foodcritic b/cookbooks/hot/.foodcritic deleted file mode 100644 index b0f9b4b7d..000000000 --- a/cookbooks/hot/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/imagery/.foodcritic b/cookbooks/imagery/.foodcritic deleted file mode 100644 index e14faa44f..000000000 --- a/cookbooks/imagery/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC005 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/incron/.foodcritic b/cookbooks/incron/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/incron/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/kibana/.foodcritic b/cookbooks/kibana/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/kibana/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/letsencrypt/.foodcritic b/cookbooks/letsencrypt/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/letsencrypt/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/logstash/.foodcritic b/cookbooks/logstash/.foodcritic deleted file mode 100644 index 563333674..000000000 --- a/cookbooks/logstash/.foodcritic +++ /dev/null @@ -1,7 +0,0 @@ -~FC001 -~FC003 -~FC019 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb index c97882d96..babff56df 100644 --- a/cookbooks/logstash/recipes/default.rb +++ b/cookbooks/logstash/recipes/default.rb @@ -74,7 +74,7 @@ template "/etc/cron.daily/expire-logstash" do mode 0o755 end -forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010 +forwarders = search(:node, "recipes:logstash\\:\\:forwarder") forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder| forwarder.interfaces(:role => :external) do |interface| @@ -100,7 +100,7 @@ forwarders.sort_by { |n| n[:fqdn] }.each do |forwarder| end end -gateways = search(:node, "roles:gateway") # ~FC010 +gateways = search(:node, "roles:gateway") gateways.sort_by { |n| n[:fqdn] }.each do |gateway| gateway.interfaces(:role => :external) do |interface| diff --git a/cookbooks/mailman/.foodcritic b/cookbooks/mailman/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/mailman/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/mediawiki/.foodcritic b/cookbooks/mediawiki/.foodcritic deleted file mode 100644 index af9a69afb..000000000 --- a/cookbooks/mediawiki/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC021 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb index 48ba062ec..1fe4faea5 100644 --- a/cookbooks/mediawiki/resources/extension.rb +++ b/cookbooks/mediawiki/resources/extension.rb @@ -64,7 +64,7 @@ action :create do end end - if new_resource.template # ~FC023 + if new_resource.template declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do cookbook new_resource.template_cookbook source new_resource.template diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 45719d6c6..a3862ca52 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -196,13 +196,13 @@ action :create do end # MobileFrontend extension is required by MinervaNeue skin - mediawiki_extension "MobileFrontend" do # ~FC005 + mediawiki_extension "MobileFrontend" do site new_resource.site template "mw-ext-MobileFrontend.inc.php.erb" end # MobileFrontend extension is required by MinervaNeue skin - mediawiki_skin "MinervaNeue" do # ~FC005 + mediawiki_skin "MinervaNeue" do site new_resource.site update_site false legacy false diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb index 63e162742..adcc2ae87 100644 --- a/cookbooks/mediawiki/resources/skin.rb +++ b/cookbooks/mediawiki/resources/skin.rb @@ -57,7 +57,7 @@ action :create do end end - if new_resource.template # ~FC023 + if new_resource.template declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Skin-#{new_resource.skin}.inc.php" do cookbook "mediawiki" source new_resource.template diff --git a/cookbooks/memcached/.foodcritic b/cookbooks/memcached/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/memcached/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/munin/.foodcritic b/cookbooks/munin/.foodcritic deleted file mode 100644 index 8f83d01e2..000000000 --- a/cookbooks/munin/.foodcritic +++ /dev/null @@ -1,7 +0,0 @@ -~FC001 -~FC003 -~FC005 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index ac1464a97..cf2b767ab 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -24,7 +24,7 @@ service "munin-node" do supports :status => true, :restart => true, :reload => true end -servers = search(:node, "recipes:munin\\:\\:server") # ~FC010 +servers = search(:node, "recipes:munin\\:\\:server") servers.each do |server| server.interfaces(:role => :external) do |interface| @@ -147,7 +147,7 @@ else end end -munin_plugin "hpasmcli_temp" do # ~FC005 +munin_plugin "hpasmcli_temp" do action :delete end diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 1cf444c73..f9fe98def 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -45,9 +45,9 @@ munin_plugin "rrdcached" expiry_time = 14 * 86400 -clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name) # ~FC010 -frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010 -backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort # ~FC010 +clients = search(:node, "recipes:munin\\:\\:default").sort_by(&:name) +frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort +backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map(&:name).sort tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by(&:name).map do |n| { :name => n.name.split(".").first, :interface => n.interfaces(:role => :external).first[:interface].tr(".", "_") } end diff --git a/cookbooks/munin/resources/plugin.rb b/cookbooks/munin/resources/plugin.rb index 01bf9167e..dede3cb53 100644 --- a/cookbooks/munin/resources/plugin.rb +++ b/cookbooks/munin/resources/plugin.rb @@ -37,7 +37,7 @@ action :create do to target_path end - if new_resource.conf # ~FC023 + if new_resource.conf munin_plugin_conf new_resource.plugin do cookbook new_resource.conf_cookbook template new_resource.conf @@ -52,7 +52,7 @@ action :delete do action :delete end - if new_resource.conf # ~FC023 + if new_resource.conf munin_plugin_conf new_resource.plugin do action :delete restart_munin false diff --git a/cookbooks/mysql/.foodcritic b/cookbooks/mysql/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/mysql/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/networking/.foodcritic b/cookbooks/networking/.foodcritic deleted file mode 100644 index c8f7322db..000000000 --- a/cookbooks/networking/.foodcritic +++ /dev/null @@ -1,7 +0,0 @@ -~FC001 -~FC003 -~FC015 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 9c273eac2..dfa73f196 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -215,7 +215,7 @@ node.interfaces(:role => :internal) do |interface| next unless gateway[:openvpn] gateway[:openvpn][:tunnels].each_value do |tunnel| - if tunnel[:peer][:address] # ~FC023 + if tunnel[:peer][:address] route tunnel[:peer][:address] do netmask "255.255.255.255" gateway interface[:gateway] diff --git a/cookbooks/nfs/.foodcritic b/cookbooks/nfs/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/nfs/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/nginx/.foodcritic b/cookbooks/nginx/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/nginx/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/nodejs/.foodcritic b/cookbooks/nodejs/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/nodejs/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/nominatim/.foodcritic b/cookbooks/nominatim/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/nominatim/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index d2f674f72..181d41c17 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -109,7 +109,7 @@ node[:nominatim][:tablespaces].each do |name, location| end end -if node[:nominatim][:state] == "master" # ~FC023 +if node[:nominatim][:state] == "master" postgresql_user "replication" do cluster node[:nominatim][:dbcluster] password data_bag_item("nominatim", "passwords")["replication"] @@ -208,7 +208,7 @@ template "#{build_directory}/settings/local.php" do :log_file => "#{node[:nominatim][:logdir]}/query.log" end -if node[:nominatim][:flatnode_file] # ~FC023 +if node[:nominatim][:flatnode_file] directory File.dirname(node[:nominatim][:flatnode_file]) do recursive true end diff --git a/cookbooks/ntp/.foodcritic b/cookbooks/ntp/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/ntp/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/ohai/.foodcritic b/cookbooks/ohai/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/ohai/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/openssh/.foodcritic b/cookbooks/openssh/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/openssh/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/openssh/recipes/default.rb b/cookbooks/openssh/recipes/default.rb index 190db29c4..49c890b34 100644 --- a/cookbooks/openssh/recipes/default.rb +++ b/cookbooks/openssh/recipes/default.rb @@ -41,18 +41,18 @@ hosts = search(:node, "networking:interfaces").sort_by { |n| n[:hostname] }.coll end keys = { - "ssh-rsa" => node[:keys][:ssh][:host_rsa_public], # ~FC039 - "ssh-dss" => node[:keys][:ssh][:host_dsa_public] # ~FC039 + "ssh-rsa" => node[:keys][:ssh][:host_rsa_public], + "ssh-dss" => node[:keys][:ssh][:host_dsa_public] } - if node[:keys][:ssh][:host_ecdsa_public] # ~FC039 - ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] # ~FC039 + if node[:keys][:ssh][:host_ecdsa_public] + ecdsa_type = node[:keys][:ssh][:host_ecdsa_type] - keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] # ~FC039 + keys[ecdsa_type] = node[:keys][:ssh][:host_ecdsa_public] end - if node[:keys][:ssh][:host_ed25519_public] # ~FC039 - keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] # ~FC039 + if node[:keys][:ssh][:host_ed25519_public] + keys["ssh-ed25519"] = node[:keys][:ssh][:host_ed25519_public] end Hash[ diff --git a/cookbooks/openvpn/.foodcritic b/cookbooks/openvpn/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/openvpn/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/osmosis/.foodcritic b/cookbooks/osmosis/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/osmosis/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/osqa/.foodcritic b/cookbooks/osqa/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/osqa/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/otrs/.foodcritic b/cookbooks/otrs/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/otrs/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/passenger/.foodcritic b/cookbooks/passenger/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/passenger/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/piwik/.foodcritic b/cookbooks/piwik/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/piwik/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/planet/.foodcritic b/cookbooks/planet/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/planet/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/postgresql/.foodcritic b/cookbooks/postgresql/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/postgresql/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/python/.foodcritic b/cookbooks/python/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/python/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/roundup/.foodcritic b/cookbooks/roundup/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/roundup/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/rsyncd/.foodcritic b/cookbooks/rsyncd/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/rsyncd/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/serverinfo/.foodcritic b/cookbooks/serverinfo/.foodcritic deleted file mode 100644 index b0f9b4b7d..000000000 --- a/cookbooks/serverinfo/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/snmpd/.foodcritic b/cookbooks/snmpd/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/snmpd/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/spamassassin/.foodcritic b/cookbooks/spamassassin/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/spamassassin/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/squid/.foodcritic b/cookbooks/squid/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/squid/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/ssl/.foodcritic b/cookbooks/ssl/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/ssl/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/stateofthemap/.foodcritic b/cookbooks/stateofthemap/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/stateofthemap/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/subversion/.foodcritic b/cookbooks/subversion/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/subversion/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/supybot/.foodcritic b/cookbooks/supybot/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/supybot/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/switch2osm/.foodcritic b/cookbooks/switch2osm/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/switch2osm/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/sysctl/.foodcritic b/cookbooks/sysctl/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/sysctl/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/sysfs/.foodcritic b/cookbooks/sysfs/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/sysfs/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/systemd/.foodcritic b/cookbooks/systemd/.foodcritic deleted file mode 100644 index 1a4fd3293..000000000 --- a/cookbooks/systemd/.foodcritic +++ /dev/null @@ -1,4 +0,0 @@ -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/taginfo/.foodcritic b/cookbooks/taginfo/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/taginfo/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/tile/.foodcritic b/cookbooks/tile/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/tile/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/tilecache/.foodcritic b/cookbooks/tilecache/.foodcritic deleted file mode 100644 index 53c271a0f..000000000 --- a/cookbooks/tilecache/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC003 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/tilelog/.foodcritic b/cookbooks/tilelog/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/tilelog/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/tools/.foodcritic b/cookbooks/tools/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/tools/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/trac/.foodcritic b/cookbooks/trac/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/trac/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/web/.foodcritic b/cookbooks/web/.foodcritic deleted file mode 100644 index 03f7b709f..000000000 --- a/cookbooks/web/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC015 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/wiki/.foodcritic b/cookbooks/wiki/.foodcritic deleted file mode 100644 index 0c118ec61..000000000 --- a/cookbooks/wiki/.foodcritic +++ /dev/null @@ -1,5 +0,0 @@ -~FC001 -~FC064 -~FC065 -~FC066 -~FC071 diff --git a/cookbooks/wordpress/.foodcritic b/cookbooks/wordpress/.foodcritic deleted file mode 100644 index af9a69afb..000000000 --- a/cookbooks/wordpress/.foodcritic +++ /dev/null @@ -1,6 +0,0 @@ -~FC001 -~FC021 -~FC064 -~FC065 -~FC066 -~FC071 -- 2.43.2