Merge pull request #30 from dsi-infrastructure/develop

Release 0.1.0

Author: sitle

Cheffile

@@ -44,8 +44,8 @@ cookbook 'sysctl',
   :ref => '8d0bcf83179a59b1bc83c57be143b990c2d395e4'
 
 cookbook 'awstat',
-  :git => 'https://github.com/fooforge/chef-cookbook_awstats',
-  :ref => '4a9beb71734833fd09693f06dc53f2330ac7f0c4'
+  :git => 'https://github.com/coletivoEITA/awstats-cookbook.git',
+  :ref => 'f8938852689bf480998c663b0b96f733c9adb40f'
 
 cookbook 'apt-cacher-ng',
   :git => 'https://github.com/shellycloud/apt-cacher-ng',
@@ -85,9 +85,9 @@ cookbook 'chef-nodeAttributes',
   :git => 'https://github.com/peychart/chef-nodeAttributes',
   :ref => 'f8c8ae84a426ee328640b90f1011a1fe4826dc5d'
 
-cookbook 'chef-qmail',
+cookbook 'qmail',
   :git => 'https://github.com/stephaneLII/chef-qmail',
-  :ref => '19e3df42d060e3adae9ec65b156d4eb3534866db'
+  :ref => '7f0ed0ade2dc93f7d264e58aa84a9ea1b0693607'
 
 cookbook 'chef-squidGuard',
   :git => 'https://github.com/peychart/chef-squidGuard',
@@ -99,15 +99,15 @@ cookbook 'chef-squid_ldap_auth',
 
 cookbook 'openldap',
   :git => 'https://github.com/sitle/openldap',
-  :ref => '85efe51a7d0e44cb63a699125d6d4c98449b5b16'
+  :ref => '48715055172c142cf889b98817a4fa416cb8fbba'
 
 cookbook 'samba',
   :git => 'https://github.com/sitle/chef-samba',
   :ref => '61909a63ec6ef6a1ea07da21caeb2a3d0ebd9954'
 
 cookbook 'chef-monitor',
   :git => 'https://github.com/sitle/chef-monitor',
-  :ref => '8fa3be73274ec7f54a4e65b9243d49f2a5a5db6f'
+  :ref => '365cccfa63a819001a3650e458bc6efe42d414b1'
 
 cookbook 'chef-reverseproxy',
   :git => 'https://github.com/dsi-infrastructure/chef-reverseproxy',
@@ -141,3 +141,6 @@ cookbook 'chef-specific',
   :git => 'https://github.com/peychart/chef-specific.gov.pf',
   :ref => '230a34fc8be8f05192d56eb604419fd182bcbced'
 
+cookbook 'dsi-users',
+  :git => 'https://github.com/stephaneLII/chef-dsi-users',
+  :ref => 'cd0831330a2812a3c68d5bed678d852115247d7d'

Cheffile.lock

@@ -79,8 +79,6 @@ SITE
       yum-epel (>= 0.0.0)
     nscd (0.12.0)
     ntp (1.7.0)
-    openssh (1.3.4)
-      iptables (>= 0.0.0)
     openssl (2.0.0)
       chef-sugar (>= 0.0.0)
     postfix (3.6.2)
@@ -136,6 +134,16 @@ GIT
   specs:
     cookbook-snmp (3.0.1)
 
+GIT
+  remote: https://github.com/coletivoEITA/awstats-cookbook.git
+  ref: f8938852689bf480998c663b0b96f733c9adb40f
+  sha: f8938852689bf480998c663b0b96f733c9adb40f
+  specs:
+    awstat (0.2.2)
+      apache2 (>= 2.0.0)
+      cron (>= 0.0.0)
+      htpasswd (>= 0.0.0)
+
 GIT
   remote: https://github.com/dsi-infrastructure/chef-reverseproxy
   ref: 5e11cc350747ebb6edb6c656c74128af36b1ff47
@@ -145,15 +153,6 @@ GIT
       apache2 (>= 0.0.0)
       hostsfile (>= 0.0.0)
 
-GIT
-  remote: https://github.com/fooforge/chef-cookbook_awstats
-  ref: 4a9beb71734833fd09693f06dc53f2330ac7f0c4
-  sha: 4a9beb71734833fd09693f06dc53f2330ac7f0c4
-  specs:
-    awstat (0.2.2)
-      apache2 (>= 0.0.0)
-      htpasswd (>= 0.0.0)
-
 GIT
   remote: https://github.com/hw-cookbooks/haproxy
   ref: bd58b4d9b6812e3519ef9d96389c6f6bb8ca04c4
@@ -304,10 +303,11 @@ GIT
 
 GIT
   remote: https://github.com/sitle/chef-monitor
-  ref: 8fa3be73274ec7f54a4e65b9243d49f2a5a5db6f
-  sha: 8fa3be73274ec7f54a4e65b9243d49f2a5a5db6f
+  ref: 365cccfa63a819001a3650e458bc6efe42d414b1
+  sha: 365cccfa63a819001a3650e458bc6efe42d414b1
   specs:
     chef-monitor (0.1.0)
+      apache2 (>= 0.0.0)
       ntp (>= 0.0.0)
       sensu (>= 0.0.0)
       sudo (>= 0.0.0)
@@ -323,19 +323,25 @@ GIT
 
 GIT
   remote: https://github.com/sitle/openldap
-  ref: 85efe51a7d0e44cb63a699125d6d4c98449b5b16
-  sha: 85efe51a7d0e44cb63a699125d6d4c98449b5b16
+  ref: 48715055172c142cf889b98817a4fa416cb8fbba
+  sha: 48715055172c142cf889b98817a4fa416cb8fbba
   specs:
-    openldap (1.12.11)
-      openssh (>= 0.0.0)
-      openssl (>= 0.0.0)
+    openldap (0.1.0)
+
+GIT
+  remote: https://github.com/stephaneLII/chef-dsi-users
+  ref: cd0831330a2812a3c68d5bed678d852115247d7d
+  sha: cd0831330a2812a3c68d5bed678d852115247d7d
+  specs:
+    dsi-users (0.1.0)
+      sudo (>= 0.0.0)
 
 GIT
   remote: https://github.com/stephaneLII/chef-qmail
-  ref: 19e3df42d060e3adae9ec65b156d4eb3534866db
-  sha: 19e3df42d060e3adae9ec65b156d4eb3534866db
+  ref: 7f0ed0ade2dc93f7d264e58aa84a9ea1b0693607
+  sha: 7f0ed0ade2dc93f7d264e58aa84a9ea1b0693607
   specs:
-    chef-qmail (0.1.0)
+    qmail (0.1.0)
 
 GIT
   remote: https://github.com/viverae-cookbooks/sysctl
@@ -373,14 +379,14 @@ DEPENDENCIES
   chef-monitor (>= 0)
   chef-nodeAttributes (>= 0)
   chef-owncloud (>= 0)
-  chef-qmail (>= 0)
   chef-reverseproxy (>= 0)
   chef-server (>= 0)
   chef-specific (>= 0)
   chef-squidGuard (>= 0)
   chef-squid_ldap_auth (>= 0)
   cookbook-snmp (>= 0)
   database (>= 0)
+  dsi-users (>= 0)
   elasticsearch (>= 0)
   haproxy (>= 0)
   iptables-ng (>= 0)
@@ -394,6 +400,7 @@ DEPENDENCIES
   ohai (>= 0)
   openldap (>= 0)
   postfix (>= 0)
+  qmail (>= 0)
   resolver (>= 0)
   rsyslog (>= 0)
   samba (>= 0)