Update subversion provider monkey patching

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

diff --git a/cookbooks/geodns/recipes/default.rb b/cookbooks/geodns/recipes/default.rb
index 8a72c17a20e5212153cd682d1f4c50fc6b68a506..a0ee24646fe42e075b1555d43bacc7e1eb35ecf9 100644 (file)
--- a/cookbooks/geodns/recipes/default.rb
+++ b/cookbooks/geodns/recipes/default.rb
@@ -17,50 +17,12 @@
 # limitations under the License.
 #
 
 # 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
 package "geoip-database-contrib"
 
 package "gdnsd"
 
 service "gdnsd" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 


@@ -68,7 +30,7 @@ template "/etc/gdnsd/config" do
   source "config.erb"
   owner "root"
   group "root"
   source "config.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[gdnsd]"
 end
 
   notifies :restart, "service[gdnsd]"
 end
 


@@ -76,7 +38,7 @@ template "/etc/gdnsd/zones/geo.openstreetmap.org" do
   source "geo.erb"
   owner "root"
   group "root"
   source "geo.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[gdnsd]"
 end
 
   notifies :restart, "service[gdnsd]"
 end