Merge pull request voxpupuli#368 from oranenj/systemd-cleanup

Depend on camptocamp/systemd and clean up service handling

Author: oranenj

.fixtures.yml

@@ -1,4 +1,5 @@
 fixtures:
   repositories:
     archive: "https://github.com/voxpupuli/puppet-archive.git"
+    systemd: "https://github.com/camptocamp/puppet-systemd.git"
     stdlib:  "https://github.com/puppetlabs/puppetlabs-stdlib.git"

manifests/params.pp

@@ -5,10 +5,6 @@
 class jira::params {
   Exec { path => ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] }
 
-  $service_file_location = '/lib/systemd/system/jira.service'
-  $service_file_template = 'jira/jira.service.erb'
-  $service_file_mode     = '0644'
-
   $json_packages = $facts['os']['family'] ? {
     'RedHat' => ['rubygem-json'],
     'Debian' => ['ruby-json'],

manifests/service.pp

@@ -13,37 +13,22 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #-----------------------------------------------------------------------------
-class jira::service (
+class jira::service {
+  assert_private()
 
-  Boolean $service_manage = $jira::service_manage,
-  String $service_ensure  = $jira::service_ensure,
-  Boolean $service_enable = $jira::service_enable,
-  $service_notify         = $jira::service_notify,
-  $service_subscribe      = $jira::service_subscribe,
-  $service_file_location  = $jira::params::service_file_location,
-  $service_file_template  = $jira::params::service_file_template,
-  $service_file_mode      = $jira::params::service_file_mode,
-
-) inherits jira::params {
-  file { $service_file_location:
-    content => template($service_file_template),
-    mode    => $service_file_mode,
+  systemd::unit_file { 'jira.service':
+    ensure  => 'present',
+    content => epp('jira/jira.service.epp'),
   }
 
-  if $service_manage {
-    exec { 'refresh_systemd':
-      command     => 'systemctl daemon-reload',
-      refreshonly => true,
-      subscribe   => File[$service_file_location],
-      before      => Service['jira'],
-    }
+  if $jira::service_manage {
+    Systemd::Unit_file['jira.service'] ~> Service['jira']
 
     service { 'jira':
-      ensure    => $service_ensure,
-      enable    => $service_enable,
-      require   => File[$service_file_location],
-      notify    => $service_notify,
-      subscribe => $service_subscribe,
+      ensure    => $jira::service_ensure,
+      enable    => $jira::service_enable,
+      notify    => $jira::service_notify,
+      subscribe => $jira::service_subscribe,
     }
   }
 }

metadata.json

@@ -12,6 +12,10 @@
     "jira"
   ],
   "dependencies": [
+    {
+      "name": "camptocamp/systemd",
+      "version_requirement": ">= 3.0.0 < 4.0.0"
+    },
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.25.0 < 8.0.0"

spec/classes/jira_service_spec.rb

@@ -19,10 +19,9 @@
             it { is_expected.to compile.with_all_deps }
 
             it do
-              is_expected.to contain_file('/lib/systemd/system/jira.service').
+              is_expected.to contain_file('/etc/systemd/system/jira.service').
                 with_content(%r{Atlassian Systemd Jira Service})
             end
-            it { is_expected.to contain_exec('refresh_systemd') }
             it { is_expected.to contain_service('jira') }
           end
 

templates/jira.service.epp

@@ -0,0 +1,14 @@
+# THIS FILE IS MANAGED BY PUPPET
+[Unit]
+Description=Atlassian Systemd Jira Service
+After=syslog.target network.target
+
+[Service]
+Type=forking
+Environment="JAVA_HOME=<%= $jira::javahome %>"
+User=<%= $jira::user %>
+ExecStart=<%= $jira::webappdir %>/bin/start-jira.sh
+ExecStop=<%= $jira::webappdir %>/bin/stop-jira.sh
+
+[Install]
+WantedBy=multi-user.target