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 (from parent 1:
37822cb
)
Move per host obsolete/local packages ignore into their own files
author
Peter Palfrader
<peter@palfrader.org>
Sun, 14 Jun 2009 10:18:31 +0000
(12:18 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sun, 14 Jun 2009 10:18:31 +0000
(12:18 +0200)
modules/nagios/files/common/obsolete-packages-ignore.d-perhost
[new file with mode: 0644]
patch
|
blob
modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore
[deleted file]
patch
|
blob
|
history
modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
[new file with mode: 0644]
patch
|
blob
modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore
[deleted file]
patch
|
blob
|
history
modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
[new file with mode: 0644]
patch
|
blob
modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore
[deleted file]
patch
|
blob
|
history
modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
[new file with mode: 0644]
patch
|
blob
modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
[deleted file]
patch
|
blob
|
history
modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
[new file with mode: 0644]
patch
|
blob
modules/nagios/manifests/client.pp
patch
|
blob
|
history
diff --git a/modules/nagios/files/common/obsolete-packages-ignore.d-perhost
b/modules/nagios/files/common/obsolete-packages-ignore.d-perhost
new file mode 100644
(file)
index 0000000..
196f183
--- /dev/null
+++ b/
modules/nagios/files/common/obsolete-packages-ignore.d-perhost
@@ -0,0
+1,6
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+# this fine intentially kept empty
diff --git
a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore
b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore
deleted file mode 100644
(file)
index
fdf0389
..0000000
--- a/
modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore
+++ /dev/null
@@
-1,11
+0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-/linux-image-.*/
-/kernel-image-.*/
-buildd
-sbuild
-
-amavisd-new
diff --git a/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
b/modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
new file mode 100644
(file)
index 0000000..
bfc2f3b
--- /dev/null
+++ b/
modules/nagios/files/per-host/liszt.debian.org/obsolete-packages-ignore.d-perhost
@@ -0,0
+1,6
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+amavisd-new
diff --git
a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore
b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore
deleted file mode 100644
(file)
index
2ef9ca8
..0000000
--- a/
modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore
+++ /dev/null
@@
-1,18
+0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-/linux-image-.*/
-/kernel-image-.*/
-buildd
-sbuild
-
-postgresql-client-common
-postgresql-client-8.4
-postgresql-server-dev-8.4
-postgresql-8.4
-libpq5
-postgresql-common
-libpq-dev
-postgresql-8.4-debversion
diff --git a/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
b/modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
new file mode 100644
(file)
index 0000000..
13d91f6
--- /dev/null
+++ b/
modules/nagios/files/per-host/samosa.debian.org/obsolete-packages-ignore.d-perhost
@@ -0,0
+1,13
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+postgresql-client-common
+postgresql-client-8.4
+postgresql-server-dev-8.4
+postgresql-8.4
+libpq5
+postgresql-common
+libpq-dev
+postgresql-8.4-debversion
diff --git
a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore
b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore
deleted file mode 100644
(file)
index
3fa180f
..0000000
--- a/
modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore
+++ /dev/null
@@
-1,11
+0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-/linux-image-.*/
-/kernel-image-.*/
-buildd
-sbuild
-
-xfsprogs
diff --git a/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
b/modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
new file mode 100644
(file)
index 0000000..
4bede3e
--- /dev/null
+++ b/
modules/nagios/files/per-host/stabile.debian.org/obsolete-packages-ignore.d-perhost
@@ -0,0
+1,6
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+xfsprogs
diff --git
a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
deleted file mode 100644
(file)
index
1cc6322
..0000000
--- a/
modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore
+++ /dev/null
@@
-1,16
+0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-/linux-image-.*/
-/kernel-image-.*/
-buildd
-sbuild
-
-zabbix-agent
-libgnutls13
-libldap2
-liblzo1
-libopencdk8
-librrd2
diff --git a/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
b/modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
new file mode 100644
(file)
index 0000000..
0c0ff0d
--- /dev/null
+++ b/
modules/nagios/files/per-host/zelenka.debian.org/obsolete-packages-ignore.d-perhost
@@ -0,0
+1,11
@@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+zabbix-agent
+libgnutls13
+libldap2
+liblzo1
+libopencdk8
+librrd2
diff --git
a/modules/nagios/manifests/client.pp
b/modules/nagios/manifests/client.pp
index
d323451
..
8c6f94c
100644
(file)
--- a/
modules/nagios/manifests/client.pp
+++ b/
modules/nagios/manifests/client.pp
@@
-35,6
+35,11
@@
class nagios::client inherits nagios {
source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
"puppet:///nagios/common/obsolete-packages-ignore" ],
require => Package["dsa-nagios-checks"];
source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore",
"puppet:///nagios/common/obsolete-packages-ignore" ],
require => Package["dsa-nagios-checks"];
+
+ "/etc/nagios/obsolete-packages-ignore.d/perhost":
+ source => [ "puppet:///nagios/per-host/$fqdn/obsolete-packages-ignore.d-perhost",
+ "puppet:///nagios/common/obsolete-packages-ignore.d-perhost" ],
+ require => Package["dsa-nagios-checks"];
}
exec { "nagios-nrpe-server restart":
}
exec { "nagios-nrpe-server restart":