Add customised copy of squid_icp munin plugin

[chef.git] / cookbooks / geodns / recipes / default.rb

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 8a72c17a20e5212153cd682d1f4c50fc6b68a506..925b47c4297fd95010165e2e18b1517a55d5b415 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,58 +17,16 @@
 # limitations under the License.
 #
 
-service "pdns" do
-  action [ :stop, :disable ]
-  supports :status => true, :restart => true, :reload => true
-end
-
-file "/etc/powerdns/countries.conf" do
-  action :delete
-end
-
-file "/etc/powerdns/pdns.d/pdns.simplebind" do
-  action :delete
-  notifies :reload, "service[pdns]"
-end
-
-file "/etc/powerdns/pdns.d/geo.conf" do
-  action :delete
-end
-
-file "/etc/powerdns/zones.d/tile.conf" do
-  action :delete
-end
-
-directory "/etc/powerdns/zones.d" do
-  action :delete
-end
-
-file "/etc/cron.weekly/geodns-update" do
-  action :delete
-end
-
-package "pdns-backend-geo" do
-  action :purge
-end
-
-package "pdns-server" do
-  action :purge
-end
-
-package "geoip-database-contrib"
-
-package "gdnsd"
-
-service "gdnsd" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
-end
+package %w[
+  geoip-database-contrib
+  gdnsd
+]
 
 template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[gdnsd]"
 end
 
@@ -76,10 +34,15 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[gdnsd]"
 end
 
+service "gdnsd" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
 firewall_rule "accept-dns-udp" do
   action :accept
   source "net"