diff --git a/Cheffile b/Cheffile
index 962e961..ecb4cfa 100644
--- a/Cheffile
+++ b/Cheffile
@@ -5,15 +5,14 @@ site "https://supermarket.getchef.com/api/v1"
 cookbook 'chef-client', :version => '4.0.0'
 cookbook 'chef-server', :version => '2.1.6'
 cookbook 'database', :version => '2.3.1'
-cookbook 'iptables-ng', :version => '2.2.4'
-cookbook 'keepalived', :version => '1.2.0'
+cookbook 'd4ea871cba8b3c762fdfc55ac38b8a6336e6037ciptables-ng', :version => '2.2.4'
+#cookbook 'keepalived', :version => '1.2.0'
 cookbook 'locales', :version => '0.3.1'
 cookbook 'nscd', :version => '0.12.0'
 cookbook 'ntp', :version => '1.7.0'
 cookbook 'postfix', :version => '3.6.2'
 cookbook 'resolver', :version => '1.2.0'
 cookbook 'rsyslog', :version => '1.13.0'
-cookbook 'squid', :version => '0.5.2'
 cookbook 'sudo', :version => '2.7.1'
 cookbook 'timezone', :version => '0.0.1'
 cookbook 'users', :version => '1.7.0'
@@ -63,23 +62,19 @@ cookbook 'chef-delegate',
 
 cookbook 'chef-haproxy-ng',
   :git => 'https://github.com/peychart/chef-haproxy-ng',
-  :ref => '06799cdb59ae7eec00f3750b572258e2c1a6842a'
+  :ref => '23cdeba4b807a1905c050cc75bc5cfbebe38393e'
 
 cookbook 'chef-keepalived',
   :git => 'https://github.com/peychart/chef-keepalived',
-  :ref => 'a6e01a6dd4aaeb46b8085d24613651a88e77e4a9'
+  :ref => '77cf52f9b9e8a13640127df6d6f993236fa1219a'
 
 cookbook 'chef-hostsfile',
   :git => 'https://github.com/peychart/chef-hostsfile',
-  :ref => '636dbf3a19384ca3fa3930c6ef57a990c54852c3'
-
-cookbook 'chef-ldap-checkbackend',
-  :git => 'https://github.com/peychart/chef-ldap-checkbackend',
-  :ref => 'f260d729e64e40e386a82bf9a77f622ed222467d'
+  :ref => 'e6fa8ff36532c7ac19f2efc8fc21cf33a03ccfe5'
 
 cookbook 'chef-lvm',
   :git => 'https://github.com/peychart/chef-lvm',
-  :ref => '18ef0f560419acf135677b5780a40f4e4f8f89c1'
+  :ref => '3aa20e9c9dab32b55a41415d89d869b2c818e542'
 
 cookbook 'lvm',
   :git => 'https://github.com/peychart/lvm',
@@ -99,15 +94,11 @@ cookbook 'qmail',
 
 cookbook 'chef-squid',
   :git => 'https://github.com/peychart/chef-squid',
-  :ref => 'aeb6643e6534c757758131a3e85c22076d7c11e7'
+  :ref => '2b8ebb8072ee34930a61dd1ae4b611100d76ba7d'
 
 cookbook 'chef-proxypacfile',
   :git => 'https://github.com/peychart/chef-proxypacfile',
-  :ref => 'bec55cfa7534b312e14fb116686296cbe0635ed7'
-
-cookbook 'chef-squid_ldap_auth',
-  :git => 'https://github.com/peychart/chef-squid_ldap_auth',
-  :ref => '05b3579ed3b7760e78c798cb883be4c43cb567e1'
+  :ref => '82accf96fff9cec3b1a657cb6cbbcbdcd3417bbd'
 
 cookbook 'openldap',
   :git => 'https://github.com/sitle/openldap',
@@ -131,11 +122,11 @@ cookbook 'mataara',
 
 cookbook 'chef-crontab',
   :git => 'https://github.com/peychart/chef-crontab',
-  :ref => '76dcd654c0a5d1c606ce727873dcc0d0947b09d2'
+  :ref => '66b0c9934fda2ff4a0e9f48966bcc46886f564a8'
 
 cookbook 'chef-iptables',
   :git => 'https://github.com/peychart/chef-iptables',
-  :ref => '0b66da6636cd88f15611cd474fe8269a5daa4860'
+  :ref => '9cb422945557b05a5fd0ea78f5207fb5cb55b014'
 
 cookbook 'chef-iscsiadm',
   :git => 'https://github.com/peychart/chef-iscsiadm',
@@ -147,7 +138,7 @@ cookbook 'chef-owncloud',
 
 cookbook 'chef-cloudfuse',
   :git => 'https://github.com/peychart/chef-cloudfuse',
-  :ref => '45887bf517bac145359cf6de711b7396903ef494'
+  :ref => '25b8b380dac2f8661d59c24361e121f4576f1248'
 
 cookbook 'chef-s3ql',
   :git => 'https://github.com/peychart/chef-s3ql',
@@ -155,7 +146,7 @@ cookbook 'chef-s3ql',
 
 cookbook 'chef-specific-gov-pf',
   :git => 'https://gitlab.gov.pf/infrastructure/chef-specifique-gov-pf.git',
-  :ref => '147dca6fddd68cf4397291a4225f24c7e2dd5fe7'
+  :ref => '290fdd2d2b9059236d351892845dea5081120476'
 
 cookbook 'dsi-users',
   :git => 'https://github.com/dsi-infrastructure/chef-dsi-users',
diff --git a/Vagrantfile b/Vagrantfile
index 1c87ff9..39c9829 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,13 +38,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
    # avant, modifier les attributs par defaut:
     chef.json = {
-      "chef-nodeAttributes" => {
-        "service" => "tomcat"
+      "chef-serviceAttributes" => {
+        "service" => "squid"
       }
     }
 
     chef.run_list = [
-         "recipe[chef-nodeAttributes::default]",
+         "recipe[chef-serviceAttributes::default]",
 #        "recipe[chef-serviceAttributes::default]",
 #        "recipe[chef-hostsfile::default]",
 #        "recipe[chef-lvm::default]",
@@ -64,7 +64,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 #        "recipe[chef-iscsi::default]"
 #        "recipe[chef-crontab::create]"
 #        "recipe[tomcat::default]"
-         "recipe[chef-tomcat-application::default]"
+         "recipe[cookbook-nmp:default]"
     ]
 
 
diff --git a/data_bags b/data_bags
index ccce9ba..c245e03 160000
--- a/data_bags
+++ b/data_bags
@@ -1 +1 @@
-Subproject commit ccce9bad52d8852a15de40a2f5119b731fd9b010
+Subproject commit c245e037aeb964f4124ff900ee78333b258e39bd
diff --git a/roles b/roles
index 4c63d7a..8a82c87 160000
--- a/roles
+++ b/roles
@@ -1 +1 @@
-Subproject commit 4c63d7af519c8a11a1b9bbf1850b9045bd06a990
+Subproject commit 8a82c87913ba4c44f1fb97c832a649b703b9dd5c