From 25b6e53205f5138fa7da67d5e9769a55b1d1aece Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Thu, 23 Feb 2017 12:10:21 +0100 Subject: [PATCH 1/5] Use a systemd unit for Ubuntu >= 16.04 --- files/ubuntu/sonar.service | 26 ++++++++++++++++++++++++++ manifests/init.pp | 34 +++++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 7 deletions(-) create mode 100644 files/ubuntu/sonar.service diff --git a/files/ubuntu/sonar.service b/files/ubuntu/sonar.service new file mode 100644 index 00000000..0d3545ab --- /dev/null +++ b/files/ubuntu/sonar.service @@ -0,0 +1,26 @@ +# Automatically generated by systemd-sysv-generator + +[Unit] +Documentation=man:systemd-sysv-generator(8) +SourcePath=/etc/init.d/sonar +Description=LSB: Sonar +Before=multi-user.target +Before=multi-user.target +Before=multi-user.target +Before=graphical.target +Before=shutdown.target +After=remote-fs.target +After=systemd-journald-dev-log.socket +Conflicts=shutdown.target + +[Service] +Type=forking +Restart=no +TimeoutSec=5min +IgnoreSIGPIPE=no +KillMode=process +GuessMainPID=no +RemainAfterExit=yes +ExecStart=/etc/init.d/sonar start +ExecStop=/etc/init.d/sonar stop +User=sonar diff --git a/manifests/init.pp b/manifests/init.pp index 3a96b781..300e4141 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -190,12 +190,32 @@ ensure => directory, } - service { 'sonarqube': - ensure => running, - name => $service, - hasrestart => true, - hasstatus => true, - enable => true, - require => File["/etc/init.d/${service}"], + if $::operatingsystem == 'Ubuntu' and + versioncmp($::operatingsystemrelease, '16.04') >= 0 { + + # Install systemd unit for sonar + + file { + '/etc/systemd/system/sonar.service': + content => file('maestrodev-sonarqube/ubuntu/sonar.service'), + require => File["/etc/init.d/${service}"] + } -> service { 'sonarqube': + ensure => running, + name => $service, + hasrestart => true, + hasstatus => true, + enable => true + } + + } else { + service { 'sonarqube': + ensure => running, + name => $service, + hasrestart => true, + hasstatus => true, + enable => true, + require => File["/etc/init.d/${service}"], + } } + } From 405740c9a4caf99c82c6ab10fac15bb8128da961 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Thu, 23 Feb 2017 12:11:30 +0100 Subject: [PATCH 2/5] Moved file --- files/{ubuntu/sonar.service => ubuntu_sonar.service} | 0 manifests/init.pp | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename files/{ubuntu/sonar.service => ubuntu_sonar.service} (100%) diff --git a/files/ubuntu/sonar.service b/files/ubuntu_sonar.service similarity index 100% rename from files/ubuntu/sonar.service rename to files/ubuntu_sonar.service diff --git a/manifests/init.pp b/manifests/init.pp index 300e4141..48ce807c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -197,7 +197,7 @@ file { '/etc/systemd/system/sonar.service': - content => file('maestrodev-sonarqube/ubuntu/sonar.service'), + content => file('maestrodev-sonarqube/ubuntu_sonar.service'), require => File["/etc/init.d/${service}"] } -> service { 'sonarqube': ensure => running, From b32e8b68dd851647b65e22b8a8bf7dd1a886f241 Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Thu, 23 Feb 2017 12:14:54 +0100 Subject: [PATCH 3/5] Corrected filename --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 48ce807c..8ad625e7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -197,7 +197,7 @@ file { '/etc/systemd/system/sonar.service': - content => file('maestrodev-sonarqube/ubuntu_sonar.service'), + content => file('sonarqube/ubuntu_sonar.service'), require => File["/etc/init.d/${service}"] } -> service { 'sonarqube': ensure => running, From 004762c0f47ddf8de3b7c96837c19383c35a5a1d Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Mon, 28 Oct 2019 10:53:51 +0100 Subject: [PATCH 4/5] fix: Fixed nofile limit for systemd --- files/ubuntu_sonar.service | 1 + 1 file changed, 1 insertion(+) diff --git a/files/ubuntu_sonar.service b/files/ubuntu_sonar.service index 0d3545ab..05875c47 100644 --- a/files/ubuntu_sonar.service +++ b/files/ubuntu_sonar.service @@ -24,3 +24,4 @@ RemainAfterExit=yes ExecStart=/etc/init.d/sonar start ExecStop=/etc/init.d/sonar stop User=sonar +LimitNOFILE=65536 From 4b784b7c260263ae2b7733eecc73179dc9ccfd8d Mon Sep 17 00:00:00 2001 From: Dennis Ploeger Date: Tue, 26 Jan 2021 13:20:47 +0100 Subject: [PATCH 5/5] feat: Changed stdlib dependency --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index f83cd37e..2ec2cf03 100644 --- a/metadata.json +++ b/metadata.json @@ -19,7 +19,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">=2.3.0 <5.0.0" + "version_requirement": ">=2.3.0 <7.0.0" } ], "operatingsystem_support": [