tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tmakinen/puppet

Browse source 
Conflicts:
	dns/manifests/init.pp
This commit is contained in:
Ossi Salmi 2012-12-03 00:23:32 +02:00
commit 29c6eb5b4d
9 changed files with 194 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apache/templates/site.https.conf.erb
View file

@ -138,9 +138,10 @@ SSLCertificateChainFile <%= @apache_ssldir %>/certs/<%= site_fqdn %>.chain.crt
# Similarly, one has to force some clients to use HTTP/1.0 to workaround
# their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
# "force-response-1.0" for this.
SetEnvIf User-Agent ".*MSIE.*" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
BrowserMatch "MSIE [2-5]" \
nokeepalive ssl-unclean-shutdown \
downgrade-1.0 force-response-1.0
# Per-Server Logging:
# The home of a custom SSL log file. Use this when you want a

8
cups/manifests/init.pp
View file

@ -31,6 +31,14 @@ class cups::client {
creates => "/usr/bin/lpr.pre-cups",
require => Package["cups"],
}
file { "/etc/printcap":
ensure => present,
source => "/etc/cups/printcap",
mode => "0644",
owner => "root",
group => "wheel",
require => Exec["cups-enable"],
}
}
}

27
dns/manifests/init.pp
View file

@ -107,6 +107,16 @@ class dns::server {
}
}
exec { "named-checkconf":
command => $chroot ? {
"" => "/usr/sbin/named-checkconf -z",
default => "/usr/sbin/named-checkconf -z -t ${chroot}"
},
refreshonly => true,
require => Exec["rndc-confgen"],
notify => Service["named"],
}
service { "named":
name => $::operatingsystem ? {
"ubuntu" => "bind9",
@ -123,7 +133,6 @@ class dns::server {
"openbsd" => "/usr/sbin/named",
default => undef,
},
require => Exec["rndc-confgen"],
}
file { "named.conf":
@ -155,7 +164,7 @@ class dns::server {
user => "root",
refreshonly => true,
require => File["/usr/local/sbin/generate-named-conf.sh"],
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${chroot}${confdir}/named.conf.options":
@ -170,7 +179,7 @@ class dns::server {
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${chroot}${confdir}/named.conf.local":
@ -185,7 +194,7 @@ class dns::server {
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
}
@ -225,7 +234,7 @@ class dns::server::ldap inherits dns::server {
command => "dnsdump.py --notest /var/named/master.in /var/named/master",
require => File["/usr/local/sbin/dnsdump.py"],
unless => "dnsdump.py --test /var/named/master.in /var/named/master",
notify => Service["named"]
notify => Exec["named-checkconf"],
}
}
@ -389,7 +398,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic":
@ -401,7 +410,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
file { "${dns::server::chroot}${zonedir}/db.${zone}-dynamic.d":
ensure => directory,
@ -423,6 +432,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
ensure => present,
source => [
"puppet:///files/dns/db.${zone}-static.${homename}",
"puppet:///files/dns/db.${zone}-static",
"puppet:///modules/dns/empty",
],
mode => "0640",
@ -432,7 +442,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
"openbsd" => undef,
default => Package["bind"],
},
notify => Service["named"],
notify => Exec["named-checkconf"],
}
exec { "update-db.${zone}-dynamic":
@ -585,5 +595,4 @@ class dns::nsupdate {
minute => "*/5",
require => File["/usr/local/sbin/nsupdate.sh"],
}
}

7
munin/manifests/init.pp
View file

@ -269,6 +269,13 @@ class munin::server {
group => $apache::sslserver::group,
require => Package["munin"],
}
file { "/etc/logrotate.d/munin-cgi":
ensure => present,
content => template("munin/munin-cgi.logrotate.erb"),
mode => "0644",
owner => "root",
group => "root",
}
file { "/var/www/html/munin/.htaccess":
ensure => present,

17
munin/templates/munin-cgi.logrotate.erb Normal file
View file

@ -0,0 +1,17 @@
/var/log/munin/munin-cgi-graph.log {
daily
missingok
rotate 7
compress
notifempty
create 0664 munin <%= scope.lookupvar('apache::sslserver::group') %>
}
/var/log/munin/munin-cgi-html.log {
daily
missingok
rotate 7
compress
notifempty
create 0664 munin <%= scope.lookupvar('apache::sslserver::group') %>
}

93
network/manifests/init.pp
View file

@ -572,3 +572,96 @@ class network::manager::disable {
}
}
# Define IPv6 prefixes for advertisement
#
# === Sample usage
#
# network::routeradvertisement::ipv6prefix { "em1":
# prefix => "2001:db8:c0de:cafe::/64"
# }
define network::routeradvertisement::ipv6prefix($prefix = "", $description = "") {
case $::operatingsystem {
"centos","redhat": {
file { "/etc/radvd.conf.d":
ensure => directory,
}
file { "/etc/radvd.conf.d/radvd-${name}.conf":
ensure => present,
mode => "0644",
owner => "root",
group => "root",
content => template("network/radvd.conf.erb"),
require => File["/etc/radvd.conf.d"],
notify => Exec["generate-radvd-conf"],
}
}
"openbsd": {
file { "/etc/rtadvd.conf.d":
ensure => directory,
}
file { "/etc/rtadvd.conf.d/rtadvd-${name}.conf":
ensure => present,
mode => "0644",
owner => "root",
group => "wheel",
content => template("network/rtadvd.conf.erb"),
before => Service["rtadvd-${name}"],
notify => Service["rtadvd-${name}"],
}
service { "rtadvd-${name}":
ensure => running,
enable => true,
start => "/usr/sbin/rtadvd -c /etc/rtadvd.conf.d/rtadvd-${name}.conf ${name}",
stop => "/usr/bin/pkill -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"",
status => "/usr/bin/pgrep -f \"^/usr/sbin/rtadvd -c [^ ]+ ${name}\$\"",
}
}
default: {
fail("Router advertisement not supported in $::operatingsystem.")
}
}
}
# Router Advertisement daemon
#
class network::routeradvertisement {
case $::operatingsystem {
"centos","redhat": {
package { "radvd":
ensure => installed,
}
service { "radvd":
ensure => running,
enable => true,
hasstatus => true,
require => [File["/etc/radvd.conf"], Package["radvd"]],
}
file { "/etc/radvd.conf":
ensure => present,
mode => "0644",
owner => "root",
group => "root",
require => Exec["generate-radvd-conf"],
notify => Service["radvd"],
}
exec { "generate-radvd-conf":
command => "/bin/cat /etc/radvd.conf.d/radvd-*.conf >/etc/radvd.conf",
path => "/bin:/usr/bin:/sbin:/usr/sbin",
refreshonly => true,
}
}
"openbsd": {
# Only network::ipv6network is needed for OpenBSD
}
default: {
fail("Router advertisement not supported in $::operatingsystem")
}
}
}

16
network/templates/radvd.conf.erb Normal file
View file

@ -0,0 +1,16 @@
# <%= description %>
interface <%= name %>
{
AdvSendAdvert on;
MinRtrAdvInterval 3;
MaxRtrAdvInterval 10;
AdvHomeAgentFlag off;
prefix <%= prefix %>
{
AdvOnLink on;
AdvAutonomous on;
AdvRouterAddr off;
};
};

4
network/templates/rtadvd.conf.erb Normal file
View file

@ -0,0 +1,4 @@
# <%= description %>
<%= name %>:\
:addr="<%= prefix.split("/").first %>":":prefixlen#<%= prefix.split("/").last %>:raflags#8:

29
python/manifests/init.pp
View file

@ -30,12 +30,37 @@ class python {
# Source directory.
# $python:
# Python executable name. Defaults to python.
# $source:
# Source path to package archive.
#
# === Sample usage
#
# python::setup::install { "/usr/local/src/moin-1.8.8": }
# python::setup::install { "/usr/local/src/moin-1.8.8":
# source => "puppet:///files/packages/moin-1.8.8.tar.gz",
# }
#
define python::setup::install($python="python") {
define python::setup::install($python="python", source="") {
if $source {
$filename = basename($source)
file { "/usr/local/src/${filename}":
ensure => present,
mode => "0644",
owner => "root",
group => $operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
source => $source,
}
util::extract::tar { $name:
ensure => latest,
strip => 1,
source => "/usr/local/src/${filename}",
require => File["/usr/local/src/${filename}"],
before => Exec["python-setup-install-${name}"],
}
}
exec { "python-setup-install-${name}":
path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin",