From 738a1ae59aade8bd0086eb0222c0df24e30d07a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Wed, 16 Jan 2013 10:22:22 +0200 Subject: [PATCH 1/4] Fixed depency error from dns::server. --- dns/manifests/init.pp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp index 0555f1b..3ec2b94 100644 --- a/dns/manifests/init.pp +++ b/dns/manifests/init.pp @@ -360,17 +360,21 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [], if $zonedir != "" { if !defined(File["${dns::server::chroot}${zonedir}"]) { file { "${dns::server::chroot}${zonedir}": - ensure => directory, - mode => $role ? { + ensure => directory, + mode => $role ? { "master" => "0750", default => "0770", }, - owner => "root", - group => $dns::server::group, - before => $role ? { + owner => "root", + group => $dns::server::group, + before => $role ? { "master" => File["${dns::server::chroot}${zonedir}/db.${zonefile}"], default => undef, }, + require => $::operatingsystem ? { + "openbsd" => undef, + default => Package["bind"], + }, } } } From eddce9a14862cad925a01e30c423c07c37322fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Wed, 16 Jan 2013 10:35:39 +0200 Subject: [PATCH 2/4] Fixed tftp::server for CentOS and RHEL 6 --- tftp/manifests/init.pp | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/tftp/manifests/init.pp b/tftp/manifests/init.pp index 42f770c..1ff8dc6 100644 --- a/tftp/manifests/init.pp +++ b/tftp/manifests/init.pp @@ -39,24 +39,31 @@ class tftp::server { } case $::operatingsystem { - debian,fedora,ubuntu: { - file { "/var/lib/tftpboot": - ensure => link, - target => "/srv/tftpboot", - force => true, - require => File["/srv/tftpboot"], + "debian","fedora","ubuntu": { + $tftpdir = "/var/lib/tftpboot" + } + "centos","redhat": { + case $::operatingsystemrelease { + /^[45]\./: { + $tftpdir = "/tftpboot" + } + default: { + $tftpdir = "/var/lib/tftpboot" + } } } default: { - file { "/tftpboot": - ensure => link, - target => "/srv/tftpboot", - force => true, - require => File["/srv/tftpboot"], - } + $tftpdir = "/tftpboot" } } + file { $tftpdir: + ensure => link, + target => "/srv/tftpboot", + force => true, + require => File["/srv/tftpboot"], + } + if "${selinux}" == "true" { selinux::manage_fcontext { "/srv/tftpboot(/.*)?": type => "tftpdir_t", From 3caa081766a3714a5aa237a56e9587fef56c1bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Thu, 17 Jan 2013 09:02:25 +0200 Subject: [PATCH 3/4] Added rpmfusion signing keys for Fedora 18. --- yum/files/keys/rpmfusion-free-fedora-18.key | 30 +++++++++++++++++++ .../keys/rpmfusion-nonfree-fedora-18.key | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 yum/files/keys/rpmfusion-free-fedora-18.key create mode 100644 yum/files/keys/rpmfusion-nonfree-fedora-18.key diff --git a/yum/files/keys/rpmfusion-free-fedora-18.key b/yum/files/keys/rpmfusion-free-fedora-18.key new file mode 100644 index 0000000..2c97922 --- /dev/null +++ b/yum/files/keys/rpmfusion-free-fedora-18.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.18 (GNU/Linux) + +mQINBE80KI8BEADWbPfx0Ql0Rip3+SZ3k+/Yw/gXBH7GdwLhnwwFjEDJfBHdUFkR +1GHQtKH7qtdyqASkPRfGQqBoDY49jssrgv4FIh9nrE8u1HpN5YhVNT0zbvGORKiS +01U75N7FjgKR+8/deUo1MBFdy7vsfvL2obW6FE5y1Lr9QRaLfVN+C9rPDB6ITcak +VIqvL2jKa//YzIZ0JYlYumbGyhuV0fDrSmkOTruXBgtATO1DtwlCsMshp9sMT+8L +W2BAURtR1yVEnXy1YEVhdkdDuX/DAbZhWdz5swAQaPEr6GVByXfwDB8Fe8D/0RUo +BQG2KBc8JqQF5HSDz5rdlKZ20U6VyR1Ihl9G3l26CWdF1iTljUHl8FIDRv+WefbJ +rvBO76mAilBnl0NCHM2AR4npvIlN8/Dd84q1Ti0OW/QugKMECelMO0ykYVYVUmwr +JUGKuSe3wxuW813N3VEaYOmhx6P+x5X3yKuKo8O1+duJZGPDV94veY6f3JijgA2j +s0pgxIjUzJ8C09z0P+vLKwtVo4VMPqhBhxk1bcrUT4t8QGtQHuS7IwXYQqd32xTM +kBrbFqegPO7dOzOLmw52o9fgHwRxL1owgYzn3uYXCzgnQYKdGgzX9QrlkuhgqLY8 +G7SR6FDdONGFE1s+looZpV/bHf2MKKLUQEUPkdIS46oRxKUNsxyAn5QZDwARAQAB +tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxOCkgPHJw +bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC +TzQojwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQNjOZFJguCnyGBxAA +x4hWU52Si0/bx9TzCCjsPmuMXb6b+0wUtqRfKtsCmRmOPUok2d1/XkyX7hJ7XHV7 +bkV+pab0ohL7DWj1Y9mRJeG6X9yRi45vP52DoWkOpoMOV9LDivsQ3BfYwxb7NriF +cI8Gq5Qec7M8JqLVk91Fve4h97rOSZlNIZfoybVOC0lpFeT6n3J/YYb1HMUtn/cu +YwOCpvWrn6/FS6bO7jCGEidogAZkGkEAKUBOD9PbiWe+Od439a7j/PzxU795nvPt +nfDab52zXxv4dCHBxcP3cyjC83+23QvMlkJkPF3J74atIP78jEcb45e8SuCTL/4W +gQBaW3RqDr5CvIuksb6dDeWGzq8+214lvrCI4kQH3RWgbS4xi+a9OdicPWtnFF68 +/ORsbFMIvMXFT5Zmhpx28OlALryiYTL9jkwqMP1S0q3JgfT4adrruc4/C/MrN1aQ +xh3wbfqT7xB0/GWKojjgRpsZ56fMUmaB2AwwlwBSpxqHTqCSkJOl1jQuvv+pNMAz +/qNooUzu9Z1kPDKtDYl0dK9kUHw5vkXn2MjOXFGLBMoXbDxxzbgJMR45/L/jCK3Q +8Cko+IaW14lSoiyQVoAikCfizAnAV+08dp/a4UK2haZd+/Xl7dKDpNSnQhOTQCoL +BpbgafmDVWWbv10cPHFCfq29RBpAaQwck2WFNF39nR8= +=53Ne +-----END PGP PUBLIC KEY BLOCK----- diff --git a/yum/files/keys/rpmfusion-nonfree-fedora-18.key b/yum/files/keys/rpmfusion-nonfree-fedora-18.key new file mode 100644 index 0000000..203ed26 --- /dev/null +++ b/yum/files/keys/rpmfusion-nonfree-fedora-18.key @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.18 (GNU/Linux) + +mQINBE80KM8BEADL982y29MH1JB8tjaglrY1H08bHAZqkeg+fsrPnk5PokXuNiK8 +9i5iMRklyHTlLJRFen8OupJ+laXAnIhzH3CBaSU4vBw0PvvhdvtTEkVe5nEIiWON +ptkAYsXzFMT6ZD0tM1ef3DB2l00g+rf9ySEqBpRhP1ccLwtVFSRJk3vMWgs1SAi8 +M7gdrEm07d1rNK4umB4UkOvJMe87Hd63sMF6PCfSkXDPEF9Pe+tltNNvPdA/dWO3 +3QY1o4NU4m0Dwh2NWNj9YKxjSGkYzOmDslSccXkeJJKySWYmHPwiIvt5nMuSXlOi +F9eNSXqMQb0qLcKJWMBovTgJWMR9CTgEtU7lAXafzZ4ePJY5uNFJ4F86slFkjgpN +DZZGFJNhDUz6TpixwxrYPV8hiUqLUlatcFrpn5vjTZpsw8gELSGCjeojI7R0qkmq +T6atgrZbLn3aJAPtOV4aVJgO2s1ATSrZWGVUAzQ+98dZM9Ys/N9EFxip6jeabwri +3AivulncY6k6XhKroQp2DTtupXB+nN+aGxaz+o2InuTJ83YaB1Zz6uU924gsHiyj +/VU7hJ4RTJq1DEhTZJ9YYqPT3fkQgA5UIebpwQhMMkWq4/YO/d/QdUAhXNJr8eDP +1VsJe13Wu8Q9I4Nlr8kWZczDnUcDipu2hpuSPDtSuEuMdO6nRyXMw9XTWQARAQAB +tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxOCkg +PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA +IgUCTzQozwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQkM4JS+MbMMok +oA//TC+/0+qslxOVmGdWtZoDvndwRTnCATWiH4UoKLlyCG9DaWZMjle3Pt85bEzZ +/cWaIzy6zZHxuYKZ8rHElhloBx8WARVPl+DRNcV4AFXMuNNckKu82YKE3Ti/G/PL +42RpT/qgR7bgdAeru3KGMBd6Qq8iroUmqzshlEdYF4i+jXOQiD629XuzsqDw4IxZ +zN6/NPgFduy6z9t4NN4lu329H+JBQHfb7TR4lh3liqcKInF0y9XOKFxzgUXahr23 +WWeSKboebHsdRtmoySYk6zAV45LOck+frzqD9qEiVysGeuw1eSFHjRMT+0TVsAoH +Bot5RoyYkF/zw9bUikCJQJ+c+gOs6EXIQO1HVdgpNRjJj3901dvaBcDpI6OX6eQP +IBLqbN6Es/uZhB4yclpHyuHQcKDnawyh5fe+5BEm4jPB9AcbvawBLrMxZMAoQVjq +zqnCkAoo66/OYeBEZYtSXRxw8VV2p0yMkZcR1IpRNYBNcnLDqFZLLJeRCYMR2UDa +hoYgIX/6t9UD0HjjBRQUlHtq9NDR3LOspmbaX39yd3dPlLbrgV5ALGD11NYvB8YG +bDI/13D5K6Ti2VgArxZqv4HOWkHwkOlUl4KnkVXTdUZDefzo6ix5sObV54l9zbaJ +FNy46lt3bTn8oI9PEsxrxC7VUXgOH3kg2G07IytyWy0FJB8= +=+k17 +-----END PGP PUBLIC KEY BLOCK----- From 486608104664c7abfc8c776e91d52b2ecc3a3ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20M=E4kinen?= Date: Thu, 17 Jan 2013 09:17:28 +0200 Subject: [PATCH 4/4] Fixed netcat for Fedora 18. --- netcat/manifests/init.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/netcat/manifests/init.pp b/netcat/manifests/init.pp index a490272..b0661ec 100644 --- a/netcat/manifests/init.pp +++ b/netcat/manifests/init.pp @@ -7,6 +7,10 @@ class netcat { package { "netcat": name => $::operatingsystem ? { "ubuntu" => "netcat", + "fedora" => $::operatingsystemrelease ? { + /^1[0-7]/ => "nc", + default => "nmap-ncat", + }, default => "nc", }, ensure => present,