poise-service 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620447ed47a3030f8b4450f2c0ff5fec761a2188
-  data.tar.gz: 675005000178c19f5b7d4422857d67372fe3d50a
+  metadata.gz: cc314f2835262cc4716868dbe28806a24fb5d6f5
+  data.tar.gz: 3283117be88a4eb5e43986d8482db391c51d0131
 SHA512:
-  metadata.gz: 61d7319f04b307c041e763ff157993957a627703bb22b32845f5cf8aae3e8f34acfc10dc955239d5258a1775a49c7a79d41b1c590e242601d1cbafa388166553
-  data.tar.gz: b908f0d756102441e6921f57ec639282b65f0d4f76546824d2e22f4e0d069bd72a062572ac89c54a43bf5661529b41a5fd2e76c8591d8cb430fa6caa8fd6feb1
+  metadata.gz: 2c7888157443d3ce72a2b79283c443f6d9a59df86c031440edae4f1422a6f35c2e741b0c201964f8d0dc451d3cde9bf07aabf272255d1b6ca8cd8436051079a8
+  data.tar.gz: 57e51c07b358673293c019684a101666d881def1b1fe9052fa0c5c8cb0feee82a4ab8ec07c4395e40dd13e5ec5371d36ad10dda8b620bbf7fb9faa49b8e1539a

data/.kitchen.yml

@@ -1,3 +1,3 @@
 ---
 #<% require 'poise_boiler' %>
-<%= PoiseBoiler.kitchen(platforms: %w{linux centos-5}, driver: 'rackspace') %>
+<%= PoiseBoiler.kitchen(platforms: %w{linux centos-5 ubuntu-16.04}, driver: 'rackspace') %>

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-- '2.2'
+- 2.3.1
 env:
   global:
   - RACKSPACE_USERNAME=coderanger

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Poise-Service Changelog
 
+## v1.4.0
+
+* [#31](https://github.com/poise/poise-service/pull/31) Add `shell` property to
+  `poise_service_user` resource.
+
 ## v1.3.1
 
 * [#25](https://github.com/poise/poise-service/pull/25) Cope with a service user

data/README.md

@@ -219,9 +219,10 @@ end
 
 * `user` – Name of the user. *(name attribute)*
 * `group` – Name of the group. Set to `false` to disable group creation. *(name attribute)*
-* `uid` – UID of the user. If unspecified it will be automatically allocated.
-* `gid` – GID of the group. If unspecified it will be automatically allocated.
+* `uid` – UID of the user. *(default: automatic)*
+* `gid` – GID of the group. *(default: automatic)*
 * `home` – Home directory of the user.
+* `shell` – Shell of the user. *(default: /bin/nologin if present or /bin/false)*
 
 ## Providers
 

data/lib/poise_service/resources/poise_service_user.rb

@@ -24,6 +24,10 @@ module PoiseService
     # (see PoiseServiceUser::Resource)
     # @since 1.0.0
     module PoiseServiceUser
+      # Shells to look for in order.
+      # @api private
+      DEFAULT_SHELLS = %w{/bin/nologin /usr/bin/nologin /bin/false}
+
       # A `poise_service_user` resource to create service users/groups.
       #
       # @since 1.0.0
@@ -59,11 +63,26 @@ module PoiseService
         #   allocated automatically.
         #   @return [Integer]
         attribute(:gid, kind_of: Integer)
+        # @!attribute shell
+        #   Login shell for the user. Optional, if not set the shell will be
+        #   determined automatically.
+        #   @return [String]
+        attribute(:shell, kind_of: String, default: lazy { default_shell })
         # @!attribute home
         #   Home directory of the user. This directory will not be created if it
         #   does not exist. Optional.
         #   @return [String]
         attribute(:home, kind_of: String)
+
+        private
+
+        # Find a default shell for service users. Tries to use nologin, but fall
+        # back on false.
+        #
+        # @return [String]
+        def default_shell
+          DEFAULT_SHELLS.find {|s| ::File.exist?(s) } || DEFAULT_SHELLS.last
+        end
       end
 
       # Provider for `poise_service_user`.
@@ -113,7 +132,7 @@ module PoiseService
             comment "Service user for #{new_resource.name}"
             gid new_resource.group if new_resource.group
             home new_resource.home
-            shell '/bin/false'
+            shell new_resource.shell
             system true
             uid new_resource.uid
           end

data/lib/poise_service/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseService
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/test/cookbook/recipes/default.rb

@@ -21,7 +21,8 @@ poise_service_test 'default' do
   base_port 5000
 end
 
-if node['platform_family'] == 'rhel' && node['platform_version'].start_with?('7')
+if node['platform_family'] == 'rhel' && node['platform_version'].start_with?('7') || \
+   node['platform'] == 'ubuntu' && node['platform_version'].to_i >= 16
   file '/no_sysvinit'
   file '/no_upstart'
   file '/no_inittab'

data/test/spec/resources/poise_service_user_spec.rb

@@ -18,12 +18,16 @@ require 'spec_helper'
 
 describe PoiseService::Resources::PoiseServiceUser do
   step_into(:poise_service_user)
+  let(:shells) { [] }
+  before do
+    allow(File).to receive(:exist?) {|s| shells.include?(s) }
+  end
   recipe do
     poise_service_user 'poise'
   end
 
   it { is_expected.to create_group('poise').with(gid: nil, system: true) }
-  it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: nil) }
+  it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: nil, shell: '/bin/false') }
 
   context 'with an explicit user and group name' do
     recipe do
@@ -34,7 +38,7 @@ describe PoiseService::Resources::PoiseServiceUser do
     end
 
     it { is_expected.to create_group('poise_group').with(gid: nil, system: true) }
-    it { is_expected.to create_user('poise_user').with(gid: 'poise_group', home: nil, system: true, uid: nil) }
+    it { is_expected.to create_user('poise_user').with(gid: 'poise_group', home: nil, system: true, uid: nil, shell: '/bin/false') }
   end # /context with an explicit user and group name
 
   context 'with no group' do
@@ -45,7 +49,7 @@ describe PoiseService::Resources::PoiseServiceUser do
     end
 
     it { is_expected.to_not create_group('poise') }
-    it { is_expected.to create_user('poise').with(gid: nil, home: nil, system: true, uid: nil) }
+    it { is_expected.to create_user('poise').with(gid: nil, home: nil, system: true, uid: nil, shell: '/bin/false') }
   end # /context with no group
 
   context 'with explicit uid' do
@@ -56,7 +60,7 @@ describe PoiseService::Resources::PoiseServiceUser do
     end
 
     it { is_expected.to create_group('poise').with(gid: nil, system: true) }
-    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: 100) }
+    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: 100, shell: '/bin/false') }
   end # /context with explicit uid
 
   context 'with explicit gid' do
@@ -67,7 +71,7 @@ describe PoiseService::Resources::PoiseServiceUser do
     end
 
     it { is_expected.to create_group('poise').with(gid: 100, system: true) }
-    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: nil) }
+    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: nil, shell: '/bin/false') }
   end # /context with explicit gid
 
   context 'with home directory' do
@@ -78,9 +82,29 @@ describe PoiseService::Resources::PoiseServiceUser do
     end
 
     it { is_expected.to create_group('poise').with(gid: nil, system: true) }
-    it { is_expected.to create_user('poise').with(gid: 'poise', home: '/home/poise', system: true, uid: nil) }
+    it { is_expected.to create_user('poise').with(gid: 'poise', home: '/home/poise', system: true, uid: nil, shell: '/bin/false') }
   end # /context with home directory
 
+  context 'with shell' do
+    recipe do
+      poise_service_user 'poise' do
+        shell '/bin/bash'
+      end
+    end
+
+    it { is_expected.to create_group('poise').with(gid: nil, system: true) }
+    it { is_expected.to create_user('poise').with(gid: 'poise', home: nil, system: true, uid: nil, shell: '/bin/bash') }
+  end # /context with shell
+
+  context 'with /bin/nologin existing' do
+    let(:shells) { %w{/bin/nologin} }
+    recipe do
+      poise_service_user 'poise'
+    end
+
+    it { is_expected.to create_user('poise').with(shell: '/bin/nologin') }
+  end # /context with /bin/nologin existing
+
   context 'with action :remove' do
     recipe do
       poise_service_user 'poise' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Chef cookbook for managing system services.
@@ -173,4 +173,3 @@ test_files:
 - test/spec/service_providers/upstart_spec.rb
 - test/spec/spec_helper.rb
 - test/spec/utils_spec.rb
-has_rdoc: