Fix backup expiry script to match prefixes correctly

[chef.git] / roles / drogon.rb

diff --git a/roles/drogon.rb b/roles/drogon.rb
index 8e4e50680d89a3d8c3bab5afe9f4f052dd83873c..2152356dca3ebadbe3441f6436582d3aea53904f 100644 (file)
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -7,9 +7,6 @@ default_attributes(
       :zelja => { :status => :administrator }
     }
   },
       :zelja => { :status => :administrator }
     }
   },

-  :hardware => {
-    :shm_size => "18g"
-  },

   :location => "Osijek, Croatia",
   :networking => {
     :interfaces => {
   :location => "Osijek, Croatia",
   :networking => {
     :interfaces => {


@@ -30,23 +27,9 @@ default_attributes(
         :gateway => "fe80::161:53:30:97"
       }
     }
         :gateway => "fe80::161:53:30:97"
       }
     }

-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "16384 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "osijek.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[carnet]",
-  "role[tilecache]"
+  "role[carnet]"

 )
 )