replace sysv with init and add provider option to tun service resource

Author: mindriot88

README.markdown

@@ -277,7 +277,7 @@ For information on stunnel global options, see [the stunnel documentation](https
 ### install\_service ###
 
 Specify whether you want this stunnel Puppet module to install stunnel as a
-system service. Installing as a service currently places a sysvinit style
+system service. Installing as a service currently places a initinit style
 initscript for each tunnel inside of /etc/init.d/stunnel-\<name\>.
 
     install_service => false,
@@ -291,15 +291,15 @@ will be removed.
 
 ### service\_init\_system ###
 
-Specify which init system will be managing the service. If set to 'sysv' then
-a sysvinit style initscript for each tunnel will be placed inside of
+Specify which init system will be managing the service. If set to 'init' then
+a initinit style initscript for each tunnel will be placed inside of
 /etc/init.d/stunnel-\<name\>. If set to 'systemd' then a systemd service unit
 config will be placed in /etc/systemd/system/stunnel-\<name\>.service.
 
-    service_init_system => 'sysv',
+    service_init_system => 'init',
     service_init_system => 'systemd',
 
-This attribute is optional and defaults to `sysv`.
+This attribute is optional and defaults to `init`.
 
 ### options ###
 

manifests/data.pp

@@ -20,7 +20,7 @@
       if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
         $service_init_system = 'systemd'
       } else {
-        $service_init_system = 'sysv'
+        $service_init_system = 'init'
       }
     }
     /Debian/: {
@@ -40,7 +40,7 @@
          ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0') >= 0) {
         $service_init_system = 'systemd'
       } else {
-        $service_init_system = 'sysv'
+        $service_init_system = 'init'
       }
     }
 

manifests/tun.pp

@@ -59,9 +59,9 @@
 #   Defaults to true
 #
 # [*service_init_system*]
-#   Which init system will be managing this service. Valid values are 'sysv'
+#   Which init system will be managing this service. Valid values are 'init'
 #   and 'systemd'.
-#   Defaults to 'sysv'
+#   Defaults to 'init'
 #
 define stunnel::tun (
   $accept,
@@ -127,8 +127,8 @@
     'UNSET' => $::stunnel::data::service_init_system,
     default => $service_init_system,
   }
-  validate_re( $service_init_system_real, '^(sysv|systemd)$',
-    '$service_init_system must be either \'sysv\' or \'systemd\'')
+  validate_re( $service_init_system_real, '^(init|systemd)$',
+    '$service_init_system must be either \'init\' or \'systemd\'')
 
   $pid = "${stunnel::data::pid_dir}/stunnel-${name}.pid"
   $output_r = $output ? {
@@ -155,7 +155,7 @@
   } else {
     $initscript_ensure = 'absent'
   }
-  if $service_init_system_real == 'sysv' {
+  if $service_init_system_real == 'init' {
     $initscript_file = "/etc/init.d/stunnel-${name}"
     file { $initscript_file:
       ensure  => $initscript_ensure,
@@ -193,6 +193,7 @@
     service { "stunnel-${name}":
       ensure    => $service_ensure_real,
       enable    => $service_enable,
+      provider  => $service_init_system_real,
       require   => $service_require,
       before    => $service_before,
       subscribe => File[$config_file],

spec/defines/stunnel_tun_spec.rb

@@ -23,7 +23,7 @@
      end
    end
 
-   it 'should contain a sysv init script' do
+   it 'should contain a init init script' do
      should contain_file('/etc/init.d/stunnel-my-tunnel').with_ensure('present')
    end