From 0ba93256399fbad7ed8fabfa39c24dd47169dde3 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 20 Nov 2018 21:28:40 +0100 Subject: [PATCH] Rename our systemd module to dsa_systemd Avoid conflict with 3rdparty. --- modules/bacula/manifests/client.pp | 4 ++-- modules/bacula/manifests/director.pp | 2 +- modules/bacula/manifests/storage.pp | 2 +- modules/buildd/manifests/init.pp | 2 +- modules/debian_org/manifests/init.pp | 2 +- modules/{systemd => dsa_systemd}/files/journald.conf | 0 .../{systemd => dsa_systemd}/files/persistency.conf | 0 .../files/systemd-cleanup-failed | 0 modules/{systemd => dsa_systemd}/manifests/init.pp | 12 ++++++------ modules/{systemd => dsa_systemd}/manifests/mask.pp | 2 +- .../{systemd => dsa_systemd}/manifests/override.pp | 2 +- modules/haveged/manifests/init.pp | 2 +- modules/munin/manifests/init.pp | 2 +- modules/onion/manifests/balance.pp | 2 +- modules/roles/manifests/rtc.pp | 2 +- modules/varnish/manifests/config.pp | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) rename modules/{systemd => dsa_systemd}/files/journald.conf (100%) rename modules/{systemd => dsa_systemd}/files/persistency.conf (100%) rename modules/{systemd => dsa_systemd}/files/systemd-cleanup-failed (100%) rename modules/{systemd => dsa_systemd}/manifests/init.pp (63%) rename modules/{systemd => dsa_systemd}/manifests/mask.pp (92%) rename modules/{systemd => dsa_systemd}/manifests/override.pp (97%) diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 8c33181b2..ea15b7325 100644 --- a/modules/bacula/manifests/client.pp +++ b/modules/bacula/manifests/client.pp @@ -63,7 +63,7 @@ class bacula::client inherits bacula { file { '/etc/systemd/system/bacula-fd.service.d/user.conf': ensure => absent, } - systemd::override { 'bacula-fd': + dsa_systemd::override { 'bacula-fd': content => @(EOT) [Service] ExecStart= @@ -74,7 +74,7 @@ class bacula::client inherits bacula { file { '/etc/systemd/system/bacula-fd.service.d/user.conf': ensure => absent, } - systemd::override { 'bacula-fd': + dsa_systemd::override { 'bacula-fd': ensure => absent, } } diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp index 86c903d6d..d0e0fa599 100644 --- a/modules/bacula/manifests/director.pp +++ b/modules/bacula/manifests/director.pp @@ -10,7 +10,7 @@ class bacula::director inherits bacula { hasstatus => true, require => Package['bacula-director-pgsql'] } - systemd::override { 'bacula-director': + dsa_systemd::override { 'bacula-director': content => @(EOT) [Unit] After=unbound.service diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp index 1e538bf17..9f72e0e0d 100644 --- a/modules/bacula/manifests/storage.pp +++ b/modules/bacula/manifests/storage.pp @@ -9,7 +9,7 @@ class bacula::storage inherits bacula { enable => true, hasstatus => true, } - systemd::override { 'bacula-sd': + dsa_systemd::override { 'bacula-sd': content => @(EOT) [Service] Group=bacula diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 9bbbeea2b..a54f54863 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -138,7 +138,7 @@ class buildd ($ensure=present) { mode => '755', } file { '/etc/systemd/journald.conf.d/persistency.conf': - source => 'puppet:///modules/systemd/persistency.conf', + source => 'puppet:///modules/dsa_systemd/persistency.conf', } # Make sure that the build directory have the correct permissions. diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp index 6e1c5dadc..6bb70c52d 100644 --- a/modules/debian_org/manifests/init.pp +++ b/modules/debian_org/manifests/init.pp @@ -6,7 +6,7 @@ class debian_org { include debian_org::apt if $systemd { - include systemd + include dsa_systemd $servicefiles = 'present' } else { $servicefiles = 'absent' diff --git a/modules/systemd/files/journald.conf b/modules/dsa_systemd/files/journald.conf similarity index 100% rename from modules/systemd/files/journald.conf rename to modules/dsa_systemd/files/journald.conf diff --git a/modules/systemd/files/persistency.conf b/modules/dsa_systemd/files/persistency.conf similarity index 100% rename from modules/systemd/files/persistency.conf rename to modules/dsa_systemd/files/persistency.conf diff --git a/modules/systemd/files/systemd-cleanup-failed b/modules/dsa_systemd/files/systemd-cleanup-failed similarity index 100% rename from modules/systemd/files/systemd-cleanup-failed rename to modules/dsa_systemd/files/systemd-cleanup-failed diff --git a/modules/systemd/manifests/init.pp b/modules/dsa_systemd/manifests/init.pp similarity index 63% rename from modules/systemd/manifests/init.pp rename to modules/dsa_systemd/manifests/init.pp index 2ee492f6e..5fff2c1a3 100644 --- a/modules/systemd/manifests/init.pp +++ b/modules/dsa_systemd/manifests/init.pp @@ -1,10 +1,10 @@ -class systemd { +class dsa_systemd { file { '/etc/systemd/journald.conf': - source => 'puppet:///modules/systemd/journald.conf', + source => 'puppet:///modules/dsa_systemd/journald.conf', } - systemd::mask { 'sys-kernel-debug-tracing.mount': } - systemd::mask { 'sys-kernel-debug.mount': } + dsa_systemd::mask { 'sys-kernel-debug-tracing.mount': } + dsa_systemd::mask { 'sys-kernel-debug.mount': } include stretch::network_online @@ -13,12 +13,12 @@ class systemd { unless => 'test -d /etc/systemd/journald.conf.d', } file { '/etc/systemd/journald.conf.d/persistency.conf': - source => 'puppet:///modules/systemd/persistency.conf', + source => 'puppet:///modules/dsa_systemd/persistency.conf', } } file { '/usr/local/sbin/systemd-cleanup-failed': - source => 'puppet:///modules/systemd/systemd-cleanup-failed', + source => 'puppet:///modules/dsa_systemd/systemd-cleanup-failed', mode => '0555', } concat::fragment { 'dsa-puppet-stuff--systemd-cleanup-failed': diff --git a/modules/systemd/manifests/mask.pp b/modules/dsa_systemd/manifests/mask.pp similarity index 92% rename from modules/systemd/manifests/mask.pp rename to modules/dsa_systemd/manifests/mask.pp index 75a1a4334..cb67ab840 100644 --- a/modules/systemd/manifests/mask.pp +++ b/modules/dsa_systemd/manifests/mask.pp @@ -1,4 +1,4 @@ -define systemd::mask ( +define dsa_systemd::mask ( $ensure = present, ) { $filename = "/etc/systemd/system/${name}" diff --git a/modules/systemd/manifests/override.pp b/modules/dsa_systemd/manifests/override.pp similarity index 97% rename from modules/systemd/manifests/override.pp rename to modules/dsa_systemd/manifests/override.pp index 24403f602..b2d210f11 100644 --- a/modules/systemd/manifests/override.pp +++ b/modules/dsa_systemd/manifests/override.pp @@ -1,4 +1,4 @@ -define systemd::override ( +define dsa_systemd::override ( $source=undef, $content=undef, $ensure=present diff --git a/modules/haveged/manifests/init.pp b/modules/haveged/manifests/init.pp index a9c9ae27b..a172a782c 100644 --- a/modules/haveged/manifests/init.pp +++ b/modules/haveged/manifests/init.pp @@ -12,7 +12,7 @@ class haveged { } # work around #858134 - systemd::override { 'haveged': + dsa_systemd::override { 'haveged': ensure => $ensure, content => @(EOT) [Unit] diff --git a/modules/munin/manifests/init.pp b/modules/munin/manifests/init.pp index 5ea2762b0..8e4e7f285 100644 --- a/modules/munin/manifests/init.pp +++ b/modules/munin/manifests/init.pp @@ -89,7 +89,7 @@ class munin { ensure => running, require => Package['munin-async'], } - systemd::override { 'munin-async': + dsa_systemd::override { 'munin-async': content => @("EOF"), [Service] RestartSec=10 diff --git a/modules/onion/manifests/balance.pp b/modules/onion/manifests/balance.pp index bbf140ad7..d3f5ba8f0 100644 --- a/modules/onion/manifests/balance.pp +++ b/modules/onion/manifests/balance.pp @@ -8,7 +8,7 @@ class onion::balance { ensure => running, require => Package['onionbalance'], } - systemd::override { 'onionbalance': + dsa_systemd::override { 'onionbalance': ensure => $ensure, content => @(EOT) [Unit] diff --git a/modules/roles/manifests/rtc.pp b/modules/roles/manifests/rtc.pp index 3e9799d50..2a6adcd03 100644 --- a/modules/roles/manifests/rtc.pp +++ b/modules/roles/manifests/rtc.pp @@ -97,7 +97,7 @@ class roles::rtc { service { 'repro': ensure => running, } - systemd::override { 'repro': + dsa_systemd::override { 'repro': content => @("EOF"), [Unit] After=network-online.target diff --git a/modules/varnish/manifests/config.pp b/modules/varnish/manifests/config.pp index 0598e605e..dc407f998 100644 --- a/modules/varnish/manifests/config.pp +++ b/modules/varnish/manifests/config.pp @@ -20,7 +20,7 @@ define varnish::config ( $listenarr = [] + $listen $listenstr = join(prefix($listenarr, "-a "), " ") - systemd::override { 'varnish': + dsa_systemd::override { 'varnish': content => @("EOF"), [Unit] After=network-online.target -- 2.20.1