From d18425f5bf1c1be5a4808d8561ca888da3b36d0c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 18 Oct 2013 16:34:35 -0400 Subject: move individual classes into their own files and lint --- manifests/apache.pp | 47 ---------------------------------------------- manifests/apache/base.pp | 4 ++++ manifests/apache/centos.pp | 24 +++++++++++++++++++++++ manifests/apache/debian.pp | 24 +++++++++++++++++++++++ 4 files changed, 52 insertions(+), 47 deletions(-) create mode 100644 manifests/apache/base.pp create mode 100644 manifests/apache/centos.pp create mode 100644 manifests/apache/debian.pp diff --git a/manifests/apache.pp b/manifests/apache.pp index 900eb1d..d4181ff 100644 --- a/manifests/apache.pp +++ b/manifests/apache.pp @@ -5,50 +5,3 @@ class passenger::apache{ defaults: { include passenger::apache::base } } } - - - -class passenger::apache::centos inherits passenger::apache::base { - package{'mod_passenger': - ensure => installed, - require => Package['apache'], - } - - file{'/var/www/passenger_buffer': - ensure => directory, - require => [ Package['apache'], Package['mod_passenger'] ], - owner => apache, group => 0, mode => 0600; - } - - file{'/etc/httpd/conf.d/mod_passenger_custom.conf': - content => "PassengerUploadBufferDir /var/www/passenger_buffer\n", - require => File['/var/www/passenger_buffer'], - notify => Service['apache'], - owner => root, group => 0, mode => 0644; - } -} - -class passenger::apache::debian inherits passenger::apache::base { - package{'libapache2-mod-passenger': - ensure => installed, - require => Package['apache2'], - } - - file{'/var/www/passenger_buffer': - ensure => directory, - require => [ Package['apache2'], Package['libapache2-mod-passenger'] ], - owner => www-data, group => 0, mode => 0600; - } - - file{'/etc/apache2/conf.d/mod_passenger_custom.conf': - content => "PassengerUploadBufferDir /var/www/passenger_buffer\n", - require => File['/var/www/passenger_buffer'], - notify => Service['apache2'], - owner => root, group => 0, mode => 0644; - } -} - -class passenger::apache::base { - # Todo ! - include apache -} diff --git a/manifests/apache/base.pp b/manifests/apache/base.pp new file mode 100644 index 0000000..441c9bd --- /dev/null +++ b/manifests/apache/base.pp @@ -0,0 +1,4 @@ +class passenger::apache::base { + # Todo ! + include apache +} diff --git a/manifests/apache/centos.pp b/manifests/apache/centos.pp new file mode 100644 index 0000000..b7b80e3 --- /dev/null +++ b/manifests/apache/centos.pp @@ -0,0 +1,24 @@ +class passenger::apache::centos inherits passenger::apache::base { + + package { 'mod_passenger': + ensure => installed, + require => Package['apache'], + } + + file { '/var/www/passenger_buffer': + ensure => directory, + require => [ Package['apache'], Package['mod_passenger'] ], + owner => apache, + group => 0, + mode => '0600'; + } + + file{ '/etc/httpd/conf.d/mod_passenger_custom.conf': + content => "PassengerUploadBufferDir /var/www/passenger_buffer\n", + require => File['/var/www/passenger_buffer'], + notify => Service['apache'], + owner => root, + group => 0, + mode => '0644'; + } +} diff --git a/manifests/apache/debian.pp b/manifests/apache/debian.pp new file mode 100644 index 0000000..38eb3fa --- /dev/null +++ b/manifests/apache/debian.pp @@ -0,0 +1,24 @@ +class passenger::apache::debian inherits passenger::apache::base { + + package { 'libapache2-mod-passenger': + ensure => installed, + require => Package['apache2'], + } + + file { '/var/www/passenger_buffer': + ensure => directory, + require => [ Package['apache2'], Package['libapache2-mod-passenger'] ], + owner => www-data, + group => 0, + mode => '0600'; + } + + file { '/etc/apache2/conf.d/mod_passenger_custom.conf': + content => "PassengerUploadBufferDir /var/www/passenger_buffer\n", + require => File['/var/www/passenger_buffer'], + notify => Service['apache2'], + owner => root, + group => 0, + mode => '0644'; + } +} -- cgit v1.2.3