From: Lucas Werkmeister Date: Thu, 23 Mar 2017 14:17:00 +0000 (+0100) Subject: fix: enable all services in systemd X-Git-Url: https://code.wpia.club/?p=infra.git;a=commitdiff_plain;h=6a7320d1533a9e8df4c082ae528eb4c2474ec609 fix: enable all services in systemd This ensures that systemd starts them as soon as possible, even if the puppet agent doesn’t run immediately. Change-Id: Ib48cc74f1d398d10a1c95fa8802243038cca01b6 --- diff --git a/environments/production/manifests/gigi.pp b/environments/production/manifests/gigi.pp index 99ce28b..faac38b 100644 --- a/environments/production/manifests/gigi.pp +++ b/environments/production/manifests/gigi.pp @@ -110,6 +110,7 @@ node gigi { require => [File['/var/lib/wpia-gigi'],Package[$gigi_pkg]] } -> service{'gigi-proxy.socket': ensure => 'running', + enable => true, provider => 'systemd', subscribe => [Exec['tar for gigi-conf'],File['/var/lib/wpia-gigi/config/profiles']], require => [Package[$gigi_pkg], File['/var/lib/wpia-gigi/keys/crt'], File['/var/lib/wpia-gigi/keys/csr'], Exec['/gigi-ready']] @@ -131,6 +132,7 @@ if $signerLocation == 'self' { }-> service{'tcpserial.service': ensure => 'running', + enable => true, provider => 'systemd', before => Service['cassiopeia-client.service'] } @@ -197,7 +199,8 @@ if $signerLocation == 'self' { File['/var/lib/cassiopeia/keys/signer_client.crt'], File['/var/lib/cassiopeia/keys/signer_client.key'], Exec['/gigi-ready']], - ensure => 'running' + ensure => 'running', + enable => true, } } diff --git a/environments/production/manifests/nginx.pp b/environments/production/manifests/nginx.pp index 373e2a8..4bb0e97 100644 --- a/environments/production/manifests/nginx.pp +++ b/environments/production/manifests/nginx.pp @@ -63,7 +63,8 @@ node front-nginx { notify => Service['nginx'] } service {'nginx': - ensure => 'running' + ensure => 'running', + enable => true, } #for gitweb hosting package{'git': diff --git a/environments/production/manifests/site.pp b/environments/production/manifests/site.pp index 4cd8d32..17e46d7 100644 --- a/environments/production/manifests/site.pp +++ b/environments/production/manifests/site.pp @@ -32,6 +32,7 @@ if $signerLocation == 'self' { }-> service{'tcpserial.service': ensure => 'running', + enable => true, provider => 'systemd', before => Service['cassiopeia-signer.service'] } @@ -98,6 +99,7 @@ if $signerLocation == 'self' { }-> service{'cassiopeia-signer.service': ensure => 'running', + enable => true, provider => 'systemd', require => [Exec['/usr/bin/openssl dhparam -out dh_param.pem 2048'], Package['cacert-cassiopeia-signer'], @@ -130,6 +132,7 @@ node exim{ notify => Service['exim4'] } service{ 'exim4': - ensure => 'running' + ensure => 'running', + enable => true, } } diff --git a/modules/container/manifests/init.pp b/modules/container/manifests/init.pp index 73162bc..68eee71 100644 --- a/modules/container/manifests/init.pp +++ b/modules/container/manifests/init.pp @@ -8,7 +8,8 @@ class container::contained { ensure => installed } service { 'puppet': - ensure => 'running' + ensure => 'running', + enable => true, } file {'/certified': content => ''