From 7db6ced463338796771d05cdac54c24731ae936f Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 28 Nov 2015 14:06:13 +0100 Subject: [bug] [jessie] register nickserver at systemd - resolves #7614 --- puppet/modules/site_nickserver/manifests/init.pp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'puppet/modules/site_nickserver/manifests') diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index c2deab0f..47df0946 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -122,6 +122,19 @@ class site_nickserver { require => Vcsrepo['/srv/leap/nickserver']; } + # register initscript at systemd on nodes newer than wheezy + # see https://leap.se/code/issues/7614 + case $::operatingsystemrelease { + /^7.*/: { } + default: { + exec { 'register_systemd_nickserver': + refreshonly => true, + command => '/bin/systemctl enable nickserver', + subscribe => File['/etc/init.d/nickserver']; + } + } + } + service { 'nickserver': ensure => running, enable => true, @@ -129,6 +142,8 @@ class site_nickserver { hasstatus => true, require => [ File['/etc/init.d/nickserver'], + File['/usr/bin/nickserver'], + Exec['register_systemd_nickserver'], Class['Site_config::X509::Key'], Class['Site_config::X509::Cert'], Class['Site_config::X509::Ca'] ]; -- cgit v1.2.3 From e2444e41f42cc21796bcc45d0363105893d8a348 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 2 Dec 2015 01:02:55 +0100 Subject: fix nickserver dependency for wheezy --- puppet/modules/site_nickserver/manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_nickserver/manifests') diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index 47df0946..0e585e10 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -130,7 +130,8 @@ class site_nickserver { exec { 'register_systemd_nickserver': refreshonly => true, command => '/bin/systemctl enable nickserver', - subscribe => File['/etc/init.d/nickserver']; + subscribe => File['/etc/init.d/nickserver'], + before => Service['nickserver']; } } } @@ -143,7 +144,6 @@ class site_nickserver { require => [ File['/etc/init.d/nickserver'], File['/usr/bin/nickserver'], - Exec['register_systemd_nickserver'], Class['Site_config::X509::Key'], Class['Site_config::X509::Cert'], Class['Site_config::X509::Ca'] ]; -- cgit v1.2.3 From 69d2549a8b3b670b10d0efe079bcbc4ba066907d Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 22 Jan 2016 17:05:26 +0100 Subject: [bug] refactor build-essential package installation In certain node setups, the webapp gems cannot get built because `build-essential` and dependent packages were not present. I refactored the `site_config::packages::build_essential` class, which now inherits `site_config::packages`. The latter class removes all unneccessary (development) packages, but when the `site_config::packages::build_essential` class is included, some dev packages are overridden to be installed. - Tested: [local] - Resolves: #7834 --- puppet/modules/site_nickserver/manifests/init.pp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'puppet/modules/site_nickserver/manifests') diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index 0e585e10..eb4415e7 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -61,13 +61,6 @@ class site_nickserver { require => Group['nickserver']; } - # - # NICKSERVER CODE NOTE: in order to support TLS, libssl-dev must be installed - # before EventMachine gem is built/installed. - # - - package { 'libssl-dev': ensure => installed } - vcsrepo { '/srv/leap/nickserver': ensure => present, revision => $sources['nickserver']['revision'], -- cgit v1.2.3