projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7aeee13
)
move absent cron.d files to one-line statements to make grepping easier
author
Peter Palfrader
<peter@palfrader.org>
Mon, 25 Dec 2017 12:23:51 +0000
(13:23 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Mon, 25 Dec 2017 12:23:51 +0000
(13:23 +0100)
14 files changed:
modules/apache2/manifests/init.pp
patch
|
blob
|
history
modules/bacula/manifests/director.pp
patch
|
blob
|
history
modules/bacula/manifests/storage.pp
patch
|
blob
|
history
modules/buildd/manifests/init.pp
patch
|
blob
|
history
modules/exim/manifests/mx.pp
patch
|
blob
|
history
modules/ganeti2/manifests/init.pp
patch
|
blob
|
history
modules/hardware/manifests/raid/proliant.pp
patch
|
blob
|
history
modules/munin/manifests/master.pp
patch
|
blob
|
history
modules/named/manifests/geodns.pp
patch
|
blob
|
history
modules/porterbox/manifests/init.pp
patch
|
blob
|
history
modules/postgres/manifests/backup_server.pp
patch
|
blob
|
history
modules/puppetmaster/manifests/init.pp
patch
|
blob
|
history
modules/roles/manifests/static_mirror.pp
patch
|
blob
|
history
modules/roles/manifests/weblog_provider.pp
patch
|
blob
|
history
diff --git
a/modules/apache2/manifests/init.pp
b/modules/apache2/manifests/init.pp
index
6eb8c6b
..
f3a598b
100644
(file)
--- a/
modules/apache2/manifests/init.pp
+++ b/
modules/apache2/manifests/init.pp
@@
-186,9
+186,7
@@
class apache2 {
notify => Exec['service apache2 reload'],
}
notify => Exec['service apache2 reload'],
}
- file { '/etc/cron.d/puppet-export-scheduled-shutdown':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-export-scheduled-shutdown': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--apache-export-shutdown':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index
7e923f8
..
13e7595
100644
(file)
--- a/
modules/bacula/manifests/director.pp
+++ b/
modules/bacula/manifests/director.pp
@@
-89,9
+89,7
@@
class bacula::director inherits bacula {
recurse => true,
source => 'puppet:///files/empty/',
}
recurse => true,
source => 'puppet:///files/empty/',
}
- file { "/etc/cron.d/puppet-bacula-stuff":
- ensure => absent,
- }
+ file { "/etc/cron.d/puppet-bacula-stuff": ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--bacula-director':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--bacula-director':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/bacula/manifests/storage.pp
b/modules/bacula/manifests/storage.pp
index
d926e4e
..
1e538bf
100644
(file)
--- a/
modules/bacula/manifests/storage.pp
+++ b/
modules/bacula/manifests/storage.pp
@@
-78,9
+78,7
@@
class bacula::storage inherits bacula {
source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
mode => '0555',
}
source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
mode => '0555',
}
- file { "/etc/cron.d/puppet-bacula-storage-stuff":
- ensure => absent,
- }
+ file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--bacula-storage':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--bacula-storage':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/buildd/manifests/init.pp
b/modules/buildd/manifests/init.pp
index
fa05663
..
5389a5f
100644
(file)
--- a/
modules/buildd/manifests/init.pp
+++ b/
modules/buildd/manifests/init.pp
@@
-75,9
+75,7
@@
class buildd ($ensure=present) {
file { '/etc/apt/preferences.d/buildd':
ensure => absent,
}
file { '/etc/apt/preferences.d/buildd':
ensure => absent,
}
- file { '/etc/cron.d/dsa-buildd':
- ensure => absent,
- }
+ file { '/etc/cron.d/dsa-buildd': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--buildd':
target => '/etc/cron.d/dsa-puppet-stuff',
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
concat::fragment { 'dsa-puppet-stuff--buildd':
target => '/etc/cron.d/dsa-puppet-stuff',
source => 'puppet:///modules/buildd/cron.d-dsa-buildd',
@@
-98,9
+96,7
@@
class buildd ($ensure=present) {
mode => '0555',
}
}
mode => '0555',
}
}
- file { '/etc/cron.d/puppet-buildd-aptitude':
- ensure => absent
- }
+ file { '/etc/cron.d/puppet-buildd-aptitude': ensure => absent }
concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
@@
-113,9
+109,7
@@
class buildd ($ensure=present) {
ensure => 'stopped',
}
ensure => 'stopped',
}
- file { '/etc/cron.d/puppet-update-buildd-schroots':
- ensure => absent
- }
+ file { '/etc/cron.d/puppet-update-buildd-schroots': ensure => absent }
if $has_srv_buildd {
concat::fragment { 'dsa-puppet-stuff--buildd-update-schroots':
target => '/etc/cron.d/dsa-puppet-stuff',
if $has_srv_buildd {
concat::fragment { 'dsa-puppet-stuff--buildd-update-schroots':
target => '/etc/cron.d/dsa-puppet-stuff',
diff --git
a/modules/exim/manifests/mx.pp
b/modules/exim/manifests/mx.pp
index
2ef980b
..
cddf405
100644
(file)
--- a/
modules/exim/manifests/mx.pp
+++ b/
modules/exim/manifests/mx.pp
@@
-42,7
+42,5
@@
class exim::mx inherits exim {
| EOF
}
}
| EOF
}
}
- file { '/etc/cron.d/dsa-email-virtualdomains':
- ensure => absent,
- }
+ file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
}
}
diff --git
a/modules/ganeti2/manifests/init.pp
b/modules/ganeti2/manifests/init.pp
index
5e03c24
..
597c1cc
100644
(file)
--- a/
modules/ganeti2/manifests/init.pp
+++ b/
modules/ganeti2/manifests/init.pp
@@
-35,9
+35,7
@@
class ganeti2 {
source => 'puppet:///modules/ganeti2/crazy-multipath-restart',
mode => '0555',
}
source => 'puppet:///modules/ganeti2/crazy-multipath-restart',
mode => '0555',
}
- file { '/etc/cron.d/puppet-crazy-multipath-restart':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-crazy-multipath-restart': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--multipath-restart':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @("EOF"),
concat::fragment { 'dsa-puppet-stuff--multipath-restart':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @("EOF"),
diff --git
a/modules/hardware/manifests/raid/proliant.pp
b/modules/hardware/manifests/raid/proliant.pp
index
f877cf5
..
60189fc
100644
(file)
--- a/
modules/hardware/manifests/raid/proliant.pp
+++ b/
modules/hardware/manifests/raid/proliant.pp
@@
-36,9
+36,7
@@
class hardware::raid::proliant {
| EOF
}
}
| EOF
}
}
- file { '/etc/cron.d/puppet-nagios-hpsa':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-nagios-hpsa': ensure => absent, }
} else {
site::aptrepo { 'debian.restricted':
ensure => absent,
} else {
site::aptrepo { 'debian.restricted':
ensure => absent,
diff --git
a/modules/munin/manifests/master.pp
b/modules/munin/manifests/master.pp
index
aa7934f
..
493b987
100644
(file)
--- a/
modules/munin/manifests/master.pp
+++ b/
modules/munin/manifests/master.pp
@@
-24,9
+24,7
@@
class munin::master {
Munin::Master_per_node<<| |>>
Munin::Master_per_node<<| |>>
- file { '/etc/cron.d/puppet-munin-cleanup':
- ensure => absent;
- }
+ file { '/etc/cron.d/puppet-munin-cleanup': ensure => absent; }
concat::fragment { 'dsa-puppet-stuff--munin-master':
target => '/etc/cron.d/dsa-puppet-stuff',
concat::fragment { 'dsa-puppet-stuff--munin-master':
target => '/etc/cron.d/dsa-puppet-stuff',
diff --git
a/modules/named/manifests/geodns.pp
b/modules/named/manifests/geodns.pp
index
7b6324c
..
f8be485
100644
(file)
--- a/
modules/named/manifests/geodns.pp
+++ b/
modules/named/manifests/geodns.pp
@@
-63,9
+63,7
@@
class named::geodns inherits named {
group => geodnssync,
mode => '0440',
}
group => geodnssync,
mode => '0440',
}
- file { '/etc/cron.d/dsa-boot-geodnssync':
- ensure => absent;
- }
+ file { '/etc/cron.d/dsa-boot-geodnssync': ensure => absent; }
concat::fragment { 'dsa-puppet-stuff--geodns-boot':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--geodns-boot':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/porterbox/manifests/init.pp
b/modules/porterbox/manifests/init.pp
index
b211cc3
..
4ed9a21
100644
(file)
--- a/
modules/porterbox/manifests/init.pp
+++ b/
modules/porterbox/manifests/init.pp
@@
-9,9
+9,7
@@
class porterbox {
mode => '0555',
source => 'puppet:///modules/porterbox/schroot-list-sessions',
}
mode => '0555',
source => 'puppet:///modules/porterbox/schroot-list-sessions',
}
- file { '/etc/cron.d/puppet-update-dchroots':
- ensure => absent;
- }
+ file { '/etc/cron.d/puppet-update-dchroots': ensure => absent; }
concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/postgres/manifests/backup_server.pp
b/modules/postgres/manifests/backup_server.pp
index
e95c4ae
..
60a948a
100644
(file)
--- a/
modules/postgres/manifests/backup_server.pp
+++ b/
modules/postgres/manifests/backup_server.pp
@@
-36,9
+36,7
@@
class postgres::backup_server {
| EOTEMPLATE
order => '99',
}
| EOTEMPLATE
order => '99',
}
- file { '/etc/cron.d/puppet-postgres-make-base-backups':
- ensure => absent;
- }
+ file { '/etc/cron.d/puppet-postgres-make-base-backups': ensure => absent; }
if $::hostname in [backuphost] {
concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
target => '/etc/cron.d/dsa-puppet-stuff',
if $::hostname in [backuphost] {
concat::fragment { 'dsa-puppet-stuff--porterbox-chroot-update':
target => '/etc/cron.d/dsa-puppet-stuff',
diff --git
a/modules/puppetmaster/manifests/init.pp
b/modules/puppetmaster/manifests/init.pp
index
d0e281e
..
21e65da
100644
(file)
--- a/
modules/puppetmaster/manifests/init.pp
+++ b/
modules/puppetmaster/manifests/init.pp
@@
-27,12
+27,8
@@
class puppetmaster {
}
Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
}
Concat::Fragment <<| tag == "onionbalance-services.yaml" |>>
- file { '/etc/cron.d/puppet-update-fastly-ips':
- ensure => absent,
- }
- file { '/etc/cron.d/update-fastly-ips':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-update-fastly-ips': ensure => absent, }
+ file { '/etc/cron.d/update-fastly-ips': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff---fastly-ips':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff---fastly-ips':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/roles/manifests/static_mirror.pp
b/modules/roles/manifests/static_mirror.pp
index
66c7f52
..
fc2721f
100644
(file)
--- a/
modules/roles/manifests/static_mirror.pp
+++ b/
modules/roles/manifests/static_mirror.pp
@@
-21,9
+21,7
@@
class roles::static_mirror {
mode => '0555',
}
mode => '0555',
}
- file { '/etc/cron.d/puppet-static-mirror':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-static-mirror': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--static-mirror':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--static-mirror':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
diff --git
a/modules/roles/manifests/weblog_provider.pp
b/modules/roles/manifests/weblog_provider.pp
index
4470fa9
..
0b3cb8d
100644
(file)
--- a/
modules/roles/manifests/weblog_provider.pp
+++ b/
modules/roles/manifests/weblog_provider.pp
@@
-5,9
+5,7
@@
class roles::weblog_provider {
onlyif => '/usr/bin/getent passwd weblogsync > /dev/null && ! [ -e /home/weblogsync/.ssh/id_rsa ]'
}
} else {
onlyif => '/usr/bin/getent passwd weblogsync > /dev/null && ! [ -e /home/weblogsync/.ssh/id_rsa ]'
}
} else {
- file { '/etc/cron.d/puppet-weblog-provider':
- ensure => absent,
- }
+ file { '/etc/cron.d/puppet-weblog-provider': ensure => absent, }
concat::fragment { 'dsa-puppet-stuff--weblog-provider':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)
concat::fragment { 'dsa-puppet-stuff--weblog-provider':
target => '/etc/cron.d/dsa-puppet-stuff',
content => @(EOF)