From: Stephen Gran Date: Wed, 25 Apr 2012 07:06:31 +0000 (+0100) Subject: ordering fixups X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=96d02de0e841b2a067dba244d62562cd46d4035b ordering fixups Signed-off-by: Stephen Gran --- diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp index c427cb99..ef4dcded 100644 --- a/modules/acpi/manifests/init.pp +++ b/modules/acpi/manifests/init.pp @@ -4,6 +4,11 @@ class acpi { ensure => installed } + service { 'acpid': + ensure => running, + require => Package['acpid'], + } + if $::lsbdistcodename != 'lenny' { package { 'acpi-support-base': ensure => installed diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp index e49b43f0..213887a9 100644 --- a/modules/dacs/manifests/init.pp +++ b/modules/dacs/manifests/init.pp @@ -14,10 +14,15 @@ class dacs { ensure => installed, } + File { + owner => root, + group => www-data, + mode => '0640', + noop => true, + } + file { '/var/log/dacs': ensure => directory, - owner => root, - group => www-data, mode => '0770', purge => true, } @@ -30,64 +35,38 @@ class dacs { '/etc/dacs/federations/debian.org/DEBIAN/groups/DACS' ]: ensure => directory, - owner => root, - group => www-data, mode => '0750', require => Package['libapache2-mod-dacs'], purge => true } file { '/etc/dacs/federations/site.conf': source => 'puppet:///modules/dacs/common/site.conf', - mode => '0640', - owner => root, - group => www-data } file { '/etc/dacs/federations/debian.org/DEBIAN/dacs.conf': source => [ "puppet:///modules/dacs/per-host/${::fqdn}/dacs.conf", 'puppet:///modules/dacs/common/dacs.conf', ], - mode => '0640', - owner => root, - group => www-data } file { '/etc/dacs/federations/debian.org/DEBIAN/acls/revocations': source => 'puppet:///modules/dacs/common/revocations', - mode => '0640', - owner => root, - group => www-data } file { '/etc/dacs/federations/debian.org/DEBIAN/groups/DACS/jurisdictions.grp': source => 'puppet:///modules/dacs/common/jurisdictions.grp', - mode => '0640', - owner => root, - group => www-data } file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-noauth.0': source => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-noauth.0", 'puppet:///modules/dacs/common/acl-noauth.0' ], - mode => '0640', - owner => root, - group => www-data, notify => Exec['dacsacl'] } file { '/etc/dacs/federations/debian.org/DEBIAN/acls/acl-private.0': source => [ "puppet:///modules/dacs/per-host/${::fqdn}/acl-private.0", 'puppet:///modules/dacs/common/acl-private.0' ], - mode => '0640', - owner => root, - group => www-data, notify => Exec['dacsacl'] } file { '/etc/dacs/federations/debian.org/federation_keyfile': source => 'puppet:///modules/dacs/private/debian.org_federation_keyfile', - mode => '0640', - owner => root, - group => www-data } file { '/etc/dacs/federations/debian.org/DEBIAN/jurisdiction_keyfile': source => 'puppet:///modules/dacs/private/DEBIAN_jurisdiction_keyfile', - mode => '0640', - owner => root, - group => www-data } exec { 'dacsacl': diff --git a/modules/entropykey/manifests/local_consumer.pp b/modules/entropykey/manifests/local_consumer.pp index ecfe24c2..48eed9c8 100644 --- a/modules/entropykey/manifests/local_consumer.pp +++ b/modules/entropykey/manifests/local_consumer.pp @@ -9,6 +9,9 @@ class entropykey::local_consumer { } service { 'ekeyd-egd-linux': - require => File['/etc/default/ekeyd-egd-linux'], + require => [ + File['/etc/default/ekeyd-egd-linux'], + Package['ekeyd-egd-linux'] + ] } } diff --git a/modules/entropykey/manifests/provider.pp b/modules/entropykey/manifests/provider.pp index fa56ebd7..f567e556 100644 --- a/modules/entropykey/manifests/provider.pp +++ b/modules/entropykey/manifests/provider.pp @@ -17,7 +17,10 @@ class entropykey::provider { service { 'ekeyd': ensure => running, - require => File['/etc/entropykey/ekeyd.conf'], + require => [ + File['/etc/entropykey/ekeyd.conf'], + Package['ekeyd'] + ] } stunnel4::server { 'ekeyd': diff --git a/modules/entropykey/manifests/remote_consumer.pp b/modules/entropykey/manifests/remote_consumer.pp index fcfc2398..f192f8f9 100644 --- a/modules/entropykey/manifests/remote_consumer.pp +++ b/modules/entropykey/manifests/remote_consumer.pp @@ -1,4 +1,6 @@ -class entropykey::remote_consumer ($entropy_provider) inherits entropykey::local_consumer { +class entropykey::remote_consumer ($entropy_provider) { + + include entropykey::local_consumer stunnel4::client { 'ekeyd': accept => '127.0.0.1:8888', diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp index 7eef2a21..8965c48d 100644 --- a/modules/ferm/manifests/rule.pp +++ b/modules/ferm/manifests/rule.pp @@ -1,4 +1,4 @@ -define ferm::rule( +define ferm::rule ( $rule, $domain='ip', $table='filter', @@ -15,5 +15,3 @@ define ferm::rule( notify => Service['ferm'], } } - - diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp index 8b9880ff..e18c0fe0 100644 --- a/modules/monit/manifests/init.pp +++ b/modules/monit/manifests/init.pp @@ -29,8 +29,6 @@ class monit { file { '/etc/monit/': ensure => directory, - owner => root, - group => root, mode => '0755', purge => true, notify => Exec['monit stop'], @@ -38,8 +36,6 @@ class monit { } file { '/etc/monit/monit.d': ensure => directory, - owner => root, - group => root, mode => '0750', purge => true, } diff --git a/modules/nfs-server/manifests/init.pp b/modules/nfs-server/manifests/init.pp index e052c71d..a9e4758d 100644 --- a/modules/nfs-server/manifests/init.pp +++ b/modules/nfs-server/manifests/init.pp @@ -4,7 +4,7 @@ class nfs-server { 'nfs-common', 'nfs-kernel-server' ]: - ensure => installed + ensure => installed } service { 'nfs-common': @@ -44,15 +44,17 @@ class nfs-server { file { '/etc/default/nfs-common': source => 'puppet:///modules/nfs-server/nfs-common.default', - require => Package['nfs-common'], + before => Package['nfs-common'], notify => Service['nfs-common'], } file { '/etc/default/nfs-kernel-server': source => 'puppet:///modules/nfs-server/nfs-kernel-server.default', - require => Package['nfs-kernel-server'], + before => Package['nfs-kernel-server'], notify => Service['nfs-kernel-server'], } file { '/etc/modprobe.d/lockd.local': - source => 'puppet:///modules/nfs-server/lockd.local.modprobe' + source => 'puppet:///modules/nfs-server/lockd.local.modprobe', + before => Package['nfs-common'], + notify => Service['nfs-common'], } } diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp index f4e24c22..0824f0f8 100644 --- a/modules/ssh/manifests/init.pp +++ b/modules/ssh/manifests/init.pp @@ -5,7 +5,8 @@ class ssh { } service { 'ssh': - ensure => running + ensure => running, + require => Package['openssh-server'] } @ferm::rule { 'dsa-ssh': diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp index 9ca68bfd..451706e1 100644 --- a/modules/vsftpd/manifests/init.pp +++ b/modules/vsftpd/manifests/init.pp @@ -8,7 +8,8 @@ class vsftpd { } service { 'vsftpd': - ensure => running + ensure => running, + require => Package['vsftpd'] } munin::check { 'vsftpd': } diff --git a/modules/xinetd/manifests/init.pp b/modules/xinetd/manifests/init.pp index 521cd4bf..845c802b 100644 --- a/modules/xinetd/manifests/init.pp +++ b/modules/xinetd/manifests/init.pp @@ -5,7 +5,8 @@ class xinetd { } service { 'xinetd': - ensure => running, - noop => true, + ensure => running, + noop => true, + require => Package['xinetd'] } }