poise-service 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d47c652392a4752bf86351b4a44606d034ed40e
-  data.tar.gz: fb3947850050d83ae21873015634b2fdfd8a13ec
+  metadata.gz: e78d99c983b8bbd140f02e127362f21d5016354b
+  data.tar.gz: 35322dfdbc04cbeac6b81f3e8c7b2a73c23cf045
 SHA512:
-  metadata.gz: fe0e0fa38159705836a939027ad6ca1dd600a67e4594a7d77290050ee8b525ffcd85ceaba13766413a096464eadab83441aff795af576b2bbf816f717f6da142
-  data.tar.gz: 9abcdb3c9c911bb924ef64662db96586c5a7b2e1719b3d6d2baabf1c2e7e635d5a22103b45bc7fe5c20b5231c32922afb4bdb425972a42fe367e4984c4f78ea8
+  metadata.gz: 5e97a66effe71fc090420174f0bb3224866fc83ff6e42b49019db07bd7b82bcafd7605f592b1b023e7c2fbe9ad90232ad68a50ae73d743b70f5d2efe1a2a4774
+  data.tar.gz: 84331025327a5ecfe30874991f13e918c93a05af914637d4c3214c6583123b1b943d43561eb5aed868debbc394ead51e31789099506df61cb5a327738329216f

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Poise-Service Changelog
 
+## v1.3.0
+
+* Allow setting `pid_file_external false` as a provider option for the `sysvinit`
+  provider to have non-standard path but keep the internal handling.
+* Improved quoting for environment variables in the `inittab` provider.
+
 ## v1.2.1
 
 * [#23](https://github.com/poise/poise-service/pull/23) Fix service templates on AIX and FreeBSD to use the correct root group.

data/README.md

@@ -245,6 +245,8 @@ process creating a PID file in the given path.
 #### Options
 
 * `pid_file` – Path to PID file that the service command will create.
+* `pid_file_external` – If true, assume the service will create the PID file
+  itself. *(default: true if `pid_file` option is set)*
 * `template` – Override the default script template. If you want to use a
   template in a different cookbook use `'cookbook:template'`.
 * `command` – Override the service command.

data/chef/templates/default/inittab.sh.erb

@@ -10,6 +10,6 @@ if Process.euid != ent.uid || Process.egid != ent.gid
   Process::UID.change_privilege(ent.uid) if Process.euid != ent.uid
 end
 (ENV["HOME"] = Dir.home("<%= @user %>")) rescue nil
-<%= @environment.map {|key, value| "ENV[\"#{key}\"] = \"#{value}\"" }.join("; ") %>
+<%= @environment.map {|key, value| "ENV[#{key.to_s.inspect}] = #{value.to_s.inspect}" }.join("; ") %>
 exec(*<%= Shellwords.split(@command).inspect %>)
 EOH

data/lib/poise_service/service_providers/sysvinit.rb

@@ -69,7 +69,7 @@ module PoiseService
             daemon: daemon,
             daemon_options: parts[1].to_s,
             pid_file: pid_file_,
-            pid_file_external: !!options['pid_file'],
+            pid_file_external: options['pid_file_external'].nil? ? !!options['pid_file'] : options['pid_file_external'],
             platform_family: node['platform_family'],
           )
         end

data/lib/poise_service/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseService
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/test/spec/resources/poise_service_spec.rb

@@ -152,6 +152,7 @@ describe PoiseService::Resources::PoiseService::Resource do
 
       context 'on Windows' do
         let(:chefspec_options) { {platform: 'windows', version: '2012R2'} }
+        before { allow(Poise::Utils::Win32).to receive(:admin_user).and_return('Administrator') } if defined?(Poise::Utils::Win32)
         it { is_expected.to eq 'C:\\' }
       end # /context on Windows
     end # /context with root

data/test/spec/service_providers/sysvinit_spec.rb

@@ -48,6 +48,22 @@ EOH
       --exec "myapp" -- --serve
 EOH
     end # /context with an external PID file
+
+
+    context 'with a non-default internal PID file' do
+      before do
+        override_attributes['poise-service']['test'] ||= {}
+        override_attributes['poise-service']['test']['pid_file'] = '/tmp/pid'
+        override_attributes['poise-service']['test']['pid_file_external'] = false
+      end
+
+      it { is_expected.to render_file('/etc/init.d/test').with_content(<<-EOH) }
+  start-stop-daemon --start --quiet --background \\
+      --pidfile "/tmp/pid" --make-pidfile \\
+      --chuid "root" --chdir "/" \\
+      --exec "myapp" -- --serve
+EOH
+    end # /context with a non-default internal PID file
   end # /context on Ubuntu
 
   context 'on CentOS' do
@@ -82,6 +98,32 @@ EOH
   Kernel.exec(*["myapp", "--serve"])
 EOH
     end # /context with an external PID file
+
+    context 'with a non-default internal PID file' do
+      before do
+        override_attributes['poise-service']['test'] ||= {}
+        override_attributes['poise-service']['test']['pid_file'] = '/tmp/pid'
+        override_attributes['poise-service']['test']['pid_file_external'] = false
+      end
+
+      it { is_expected.to render_file('/etc/init.d/test').with_content(<<-EOH) }
+pid_file = "/tmp/pid"
+File.unlink(pid_file) if File.exist?(pid_file)
+if Process.fork
+  sleep(1) until File.exist?(pid_file)
+else
+  Process.daemon(true)
+  Dir.chdir("/")
+  IO.write(pid_file, Process.pid)
+  ent = Etc.getpwnam("root")
+  if Process.euid != ent.uid || Process.egid != ent.gid
+    Process.initgroups(ent.name, ent.gid)
+    Process::GID.change_privilege(ent.gid) if Process.egid != ent.gid
+    Process::UID.change_privilege(ent.uid) if Process.euid != ent.uid
+  end
+  Kernel.exec(*["myapp", "--serve"])
+EOH
+    end # /context with a non-default internal PID file
   end # /context on CentOS
 
   context 'with action :disable' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-service
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite