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:
8bb003c
)
retire paganini (RT#4407)
author
Peter Palfrader
<peter@palfrader.org>
Wed, 12 Feb 2014 08:31:21 +0000
(09:31 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Wed, 12 Feb 2014 08:31:21 +0000
(09:31 +0100)
modules/debian-org/misc/local.yaml
patch
|
blob
|
history
modules/ferm/manifests/per-host.pp
patch
|
blob
|
history
modules/sudo/files/sudoers
patch
|
blob
|
history
modules/syslog-ng/templates/syslog-ng.conf.erb
patch
|
blob
|
history
diff --git
a/modules/debian-org/misc/local.yaml
b/modules/debian-org/misc/local.yaml
index
546e236
..
57fd6d1
100644
(file)
--- a/
modules/debian-org/misc/local.yaml
+++ b/
modules/debian-org/misc/local.yaml
@@
-85,7
+85,6
@@
nameinfo:
nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
- paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
parry.debian.org: Sir Charles Hubert Hastings Parry, 1st Baronet (February 27th, 1848 – October 7th, 1918)
partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
pasquini.debian.org: Bernardo Pasquini (December 7th, 1637 - November 22nd, 1710)
diff --git
a/modules/ferm/manifests/per-host.pp
b/modules/ferm/manifests/per-host.pp
index
a72b912
..
6f8b418
100644
(file)
--- a/
modules/ferm/manifests/per-host.pp
+++ b/
modules/ferm/manifests/per-host.pp
@@
-38,16
+38,6
@@
class ferm::per-host {
rule => '&SERVICE(udp, 69)'
}
}
rule => '&SERVICE(udp, 69)'
}
}
- #paganini: {
- # @ferm::rule { 'dsa-dhcp':
- # description => 'Allow dhcp access',
- # rule => '&SERVICE(udp, 67)'
- # }
- # @ferm::rule { 'dsa-tftp':
- # description => 'Allow tftp access',
- # rule => '&SERVICE(udp, 69)'
- # }
- #}
lotti,lully: {
@ferm::rule { 'dsa-syslog':
description => 'Allow syslog access',
lotti,lully: {
@ferm::rule { 'dsa-syslog':
description => 'Allow syslog access',
diff --git
a/modules/sudo/files/sudoers
b/modules/sudo/files/sudoers
index
5cf4967
..
9058d67
100644
(file)
--- a/
modules/sudo/files/sudoers
+++ b/
modules/sudo/files/sudoers
@@
-27,7
+27,7
@@
Host_Alias WEBHOSTS = wolkenstein
Host_Alias SECHOSTS = chopin
Host_Alias FTPHOSTS = franck
Host_Alias ZIVITHOSTS = zelenka, zandonai
Host_Alias SECHOSTS = chopin
Host_Alias FTPHOSTS = franck
Host_Alias ZIVITHOSTS = zelenka, zandonai
-Host_Alias AACRAIDHOSTS =
paganini,
respighi, beethoven, pettersson
+Host_Alias AACRAIDHOSTS = respighi, beethoven, pettersson
Host_Alias MEGARAIDHOSTS = rautavaara, sibelius
Host_Alias MPTRAIDHOSTS = barber, biber, cilea, vitry, orff
Host_Alias MEGACTLHOSTS = nielsen
Host_Alias MEGARAIDHOSTS = rautavaara, sibelius
Host_Alias MPTRAIDHOSTS = barber, biber, cilea, vitry, orff
Host_Alias MEGACTLHOSTS = nielsen
diff --git
a/modules/syslog-ng/templates/syslog-ng.conf.erb
b/modules/syslog-ng/templates/syslog-ng.conf.erb
index
53ce00d
..
546bf1c
100644
(file)
--- a/
modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/
modules/syslog-ng/templates/syslog-ng.conf.erb
@@
-117,11
+117,6
@@
source s_local {
# messages from the kernel
file("/dev/klog" program_override("kernel: ") follow-freq(1));
<%- end -%>
# messages from the kernel
file("/dev/klog" program_override("kernel: ") follow-freq(1));
<%- end -%>
-<%- if hostname == "paganini" -%>
- # use the following line if you want to receive remote UDP logging messages
- # (this is equivalent to the "-r" syslogd flag)
- udp();
-<%- end -%>
};
<%- if (hostname == "lotti") || (hostname == "lully") -%>
};
<%- if (hostname == "lotti") || (hostname == "lully") -%>