Version v0.2.1. Add option to force create dir in 'filesystem' recipe, and other minor additions.

@@ -2,11 +2,11 @@ source "https://supermarket.chef.io"
 
 metadata
 
-cookbook 'cfe-users', git: 'https://gitlab.chromedia.com/ops/cfe-users.git', tag: 'v0.1.1'
+cookbook 'cfe-users', git: 'https://gitlab.chromedia.com/ops/cfe-users.git', tag: 'v0.2.0'
 cookbook 'cfe-mariadb', git: 'https://gitlab.chromedia.com/ops/cfe-mariadb.git', tag: 'v0.5.1'
 cookbook 'cfe-mongodb', git: 'https://gitlab.chromedia.com/ops/cfe-mongodb.git', tag: 'v0.1.0'
 cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3.git', tag: 'v0.4.1'
-cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2'
+cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.5'
 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0'
 
 cookbook 'cookbook-letsencrypt', git: 'https://github.com/nollieheel/cookbook-letsencrypt.git', tag: 'v0.3.1'

+## 0.2.1 - 2017-05-12
+### Added
+- In the ['filesystem']['perms'] array, give an option to create a directory if it does not exist.
+- ['misc']['sshd']['conf_path'] can now be set to false. Doing so will make the recipe not touch the sshd config file at all.
+- Add option to not include the 'cfe-users' recipe.
+
 ## 0.2.0 - 2017-01-04
 ### Added
 - Add dependency to 'cfe-mongodb' (removed 'mongodb3' direct dependency).

@@ -48,7 +48,7 @@ Tested on Ubuntu 14.04.
   <tr>
     <td><tt>['cfe-server']['filesystem']['perms']</tt></td>
     <td>Array</td>
-    <td>Custom permissions and/or ownerships to specific filesystem paths. Please see the default attrbutes file for examples.</td>
+    <td>Custom permissions and/or ownerships to specific filesystem paths. Can also create directories if they don't exist. Please see the default attributes file for examples.</td>
     <td><tt>[]</tt></td>
   </tr>
   <tr>

@@ -36,6 +36,8 @@ databag =
   end
 secret = Chef::EncryptedDataBagItem.load(databag, "#{cb}-secret")
 
+default[cb]['os']['include_users'] = true
+
 default[cb]['db']['include_mongodb'] = true
 default[cb]['db']['include_mariadb'] = true
 default[cb]['db']['mariadb']['install'] = false
@@ -44,10 +46,11 @@ default[cb]['filesystem']['swapfile'] = false
 default[cb]['filesystem']['swapsize'] = '2G'
 default[cb]['filesystem']['perms'] = [
 #  {
-#    :path => '/path',
-#    :owner => nil, # Optional
-#    :group => nil, # Optional
-#    :mode  => nil # Optional
+#    :path   => '/path',
+#    :owner  => nil, # Optional
+#    :group  => nil, # Optional
+#    :mode   => nil, # Optional
+#    :create => false # Optional, default: false
 #  }
 ]
 default[cb]['filesystem']['symlinks'] = {

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 description      'Simplifies setting up common Linux servers.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.0'
+version          '0.2.1'
 
 %w{
   cfe-users           cfe-mariadb 

@@ -67,16 +67,31 @@ end
 include_recipe 'backup-file2s3'
 
 node[cookbook_name]['filesystem']['perms'].each do |perm|
-  if perm[:owner] && perm[:group]
-    execute "chown -R #{perm[:owner]}:#{perm[:group]} #{perm[:path]}"
-  elsif perm[:owner]
-    execute "chown -R #{perm[:owner]} #{perm[:path]}"
-  elsif perm[:group]
-    execute "chgrp -R #{perm[:group]} #{perm[:path]}"
-  end
+  if ::Dir.exist?(perm[:path])
+
+    if perm[:owner] && perm[:group]
+      execute "chown -R #{perm[:owner]}:#{perm[:group]} #{perm[:path]}"
+    elsif perm[:owner]
+      execute "chown -R #{perm[:owner]} #{perm[:path]}"
+    elsif perm[:group]
+      execute "chgrp -R #{perm[:group]} #{perm[:path]}"
+    end
+
+    if perm[:mode]
+      execute "chmod -R #{perm[:mode]} #{perm[:path]}"
+    end
+
+  else
+
+    directory perm[:path] do
+      if perm[:owner] then owner perm[:owner] end
+      if perm[:group] then group perm[:group] end
+      if perm[:mode] then mode perm[:mode] end
+
+      only_if { perm[:create] }
+      recursive true
+    end
 
-  if perm[:mode]
-    execute "chmod -R #{perm[:mode]} #{perm[:path]}"
   end
 end
 

@@ -50,11 +50,13 @@ node[cookbook_name]['misc']['logrotatejobs'].each do |ljob|
   end
 end
 
-template node[cookbook_name]['misc']['sshd']['conf_path'] do
-  mode 0644
-  variables(
-    :ports => node[cookbook_name]['misc']['sshd']['ports']
-  )
+if node[cookbook_name]['misc']['sshd']['conf_path']
+  template node[cookbook_name]['misc']['sshd']['conf_path'] do
+    mode 0644
+    variables(
+      :ports => node[cookbook_name]['misc']['sshd']['ports']
+    )
+  end
 end
 
 include_recipe 'cfe-simple-iptables'

@@ -20,4 +20,7 @@
 
 include_recipe 'cookbook-updater::onetime'
 include_recipe 'cookbook-updater::packages'
-include_recipe 'cfe-users'
+
+if node[cookbook_name]['os']['include_users']
+  include_recipe 'cfe-users'
+end