Feature/master/systemd compatibility

lib/facter/gitlab_systemd.rb

@@ -0,0 +1,18 @@
+# Fact: gitlab_systemd
+#
+# Purpose: 
+#   Determine whether SystemD is the init system on the node
+#
+# Resolution:
+#   Check the name of the process 1 (ps -p 1)
+#
+# Caveats:
+#	Duplicates the fact "systemd" from camptocamp/puppet-systemd
+#
+
+Facter.add(:gitlab_systemd) do
+  confine :kernel => :linux
+  setcode do
+    Facter::Util::Resolution.exec('ps -p 1 -o comm=') == 'systemd'
+  end
+end

manifests/init.pp

@@ -28,6 +28,12 @@
 #   Default: true
 #   Run the system service on boot.
 #
+# [*service_initd_ensure*]
+#   Default for systemd systems, as determined by the $::gitlab_systemd fact: "absent"
+#   Else: "link"
+#   Sets "ensure => 'absent'" or "ensure => 'link'" on init.d softlink
+#   depending on the $::gitlab_systemd fact to avoid conflicts with systemd.
+#
 # [*service_exec*]
 #   Default: '/usr/bin/gitlab-ctl'
 #   The service executable path.
@@ -253,6 +259,7 @@
   $package_pin = $::gitlab::params::package_pin,
   # system service configuration
   $service_enable = $::gitlab::params::service_enable,
+  $service_initd_ensure = $::gitlab::params::service_initd_ensure,
   $service_ensure = $::gitlab::params::service_ensure,
   $service_group = $::gitlab::params::service_group,
   $service_hasrestart = $::gitlab::params::service_hasrestart,

manifests/params.pp

@@ -31,6 +31,12 @@
     $service_enable = true
   }
 
+  if ($::gitlab_systemd) {
+    $service_initd_ensure = 'absent'
+  } else {
+    $service_initd_ensure = 'link'
+  }
+
   # gitlab specific
   $config_manage = true
   $config_file = '/etc/gitlab/gitlab.rb'

manifests/service.pp

@@ -6,7 +6,7 @@
 class gitlab::service {
   if $::gitlab::service_manage {
     file { "/etc/init.d/${::gitlab::service_name}":
-      ensure => 'link',
+      ensure => $::gitlab::service_initd_ensure,
       target => $::gitlab::service_exec,
     } ->
     service { $::gitlab::service_name: