diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-29 18:37:46 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-29 18:37:46 -0400 |
| commit | 88dc913a5da951b1a261b6cc6d9767aaf641287d (patch) | |
| tree | 30794068ba44967b4e4ec4d1dce2850f506deb1b /manifests | |
| parent | 0e7099174fdef951c81880b51e23342fcde86374 (diff) | |
| parent | 090e59ad1fcba01e868237a83cadf9254cf09d3e (diff) | |
Merge branch 'leap' into riseup
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/debian.pp | 26 | ||||
| -rw-r--r-- | manifests/init.pp | 6 | ||||
| -rw-r--r-- | manifests/munin.pp | 3 |
3 files changed, 24 insertions, 11 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index 345feae..d009e25 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,7 +3,7 @@ class apache::debian inherits apache::package { $config_dir = '/etc/apache2' Package[apache] { - name => 'apache2', + name => 'apache2', } File[vhosts_dir] { path => "${config_dir}/sites-enabled", @@ -12,27 +12,33 @@ class apache::debian inherits apache::package { path => "${config_dir}/mods-enabled", } File[htpasswd_dir] { - path => "/var/www/htpasswds", - group => 'www-data', + path => '/var/www/htpasswds', + group => 'www-data', } File[default_apache_index] { path => '/var/www/index.html', } file { 'apache_main_config': - path => "${config_dir}/apache2.conf", - source => [ "puppet:///modules/site_apache/config/Debian/{$::fqdn}/apache2.conf", + path => "${config_dir}/apache2.conf", + source => [ "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf", + "puppet:///modules/site_apache/config/Debian/${::fqdn}/apache2.conf", "puppet:///modules/site_apache/config/Debian.${::lsbdistcodename}/apache2.conf", - "puppet:///modules/site_apache/config/Debian/apache2.conf", - "puppet:///modules/apache/config/Debian/apache2.conf" ], + 'puppet:///modules/site_apache/config/Debian/apache2.conf', + "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf", + "puppet:///modules/apache/config/Debian/${::fqdn}/apache2.conf", + "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/apache2.conf", + 'puppet:///modules/apache/config/Debian/apache2.conf' ], require => Package['apache'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; + notify => Service['apache'], + owner => root, + group => 0, + mode => '0644'; } apache::config::global{ 'charset': } apache::config::global{ 'security': } file { 'default_debian_apache_vhost': - path => '/etc/apache2/sites-enabled/000-default', ensure => absent, + path => '/etc/apache2/sites-enabled/000-default', } } diff --git a/manifests/init.pp b/manifests/init.pp index 574c212..542e7aa 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,7 +17,8 @@ class apache( $cluster_node = '', $manage_shorewall = false, $manage_munin = false, - $no_default_site = false + $no_default_site = false, + $ssl = false ) { case $::operatingsystem { centos: { include apache::centos } @@ -32,5 +33,8 @@ class apache( if $apache::manage_shorewall { include shorewall::rules::http } + if $ssl { + include apache::ssl + } } diff --git a/manifests/munin.pp b/manifests/munin.pp index 8b5bda1..2a04e97 100644 --- a/manifests/munin.pp +++ b/manifests/munin.pp @@ -1,5 +1,8 @@ # manage apache monitoring things class apache::munin { + + include perl::extensions::libwww + munin::plugin{ [ 'apache_accesses', 'apache_processes', 'apache_volume' ]: } munin::plugin::deploy { 'apache_activity': source => 'apache/munin/apache_activity', |