Pahoughton test

.gitignore

@@ -0,0 +1,6 @@
+*~
+.librarian/
+.tmp/
+Puppetfile.lock
+list/
+Gemfile.lock

.travis.yml

@@ -0,0 +1,17 @@
+# .travis.yml - 2014-05-10 03:03
+#
+# Copyright (c) 2014 Paul Houghton <[email protected]>
+
+language: ruby
+notifications:
+  email:
+    - [email protected]
+
+rvm:
+ - 1.9.3
+ - 2.0.0
+env:
+  matrix:
+  - PUPPET_GEM_VERSION="~> 3.4.3"
+  - PUPPET_GEM_VERSION="~> 3.5.1"
+script: "bundle exec rake -t lint unittest_prep unittest_suite"

Gemfile

@@ -0,0 +1,20 @@
+# Gemfile - 2014-05-10 03:03
+#
+# Copyright (c) 2014 Paul Houghton <[email protected]>
+#
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'builder','~>3.2.2'
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'rspec-puppet'
+  gem 'librarian-puppet'
+  gem 'puppet-lint', '~> 0.3.2'
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end

Puppetfile

@@ -0,0 +1,9 @@
+# Puppetfile - 2014-05-15 03:27
+#
+# Copyright (c) 2014 Paul Houghton <[email protected]>
+#
+forge "http://forge.puppetlabs.com"
+
+mod 'pahoughton/nginx',
+  :git => 'http://github.com/pahoughton/puppet-nginx',
+  :ref => 'pahoughton-devel'

README.md

@@ -1,4 +1,4 @@
-# puppet-php
+# puppet-php [![Build Status](https://travis-ci.org/pahoughton/puppet-php.png)](https://travis-ci.org/pahoughton/puppet-php)
 
 ## Overview
 
@@ -88,4 +88,3 @@ Then from the nginx configuration :
       include /etc/nginx/fastcgi.conf;
       fastcgi_pass wwwbackend;
     }
-

Rakefile

@@ -0,0 +1,65 @@
+# Rakefile - 2014-03-27 06:45
+#
+# Copyright (c) 2014 Paul Houghton <[email protected]>
+#
+
+require 'rake'
+require 'rspec/core/rake_task'
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.disable_80chars
+PuppetLint.configuration.disable_class_parameter_defaults
+PuppetLint.configuration.ignore_paths = FileList['**/fixtures/modules/**/**']
+
+desc "Test prep with librarian-puppet"
+task :unittest_prep do
+ sh "
+if [ -f Puppetfile ] ; then
+  if [ -d .librarian ] ; then
+    echo updating...
+    librarian-puppet update;
+  else
+    echo installing...
+    librarian-puppet install --path=spec/fixtures/modules/;
+  fi
+fi
+"
+end
+
+desc "Unit tests"
+RSpec::Core::RakeTask.new(:unittest) do |t|
+  t.pattern = 'spec/unit/**/*_spec.rb'
+end
+
+desc "Unit tests"
+RSpec::Core::RakeTask.new(:unittest_doc) do |t|
+  t.rspec_opts = ['--format=d']
+  t.pattern = 'spec/unit/**/*_spec.rb'
+end
+
+desc "Unit-suite tests w/o doc"
+RSpec::Core::RakeTask.new(:unittest_nodoc) do |t|
+  t.pattern = 'spec/unit-suite/**/*_spec.rb'
+end
+
+desc "Unit-suite tests w/o doc"
+RSpec::Core::RakeTask.new(:unittest_suite) do |t|
+  t.rspec_opts = ['--format=d']
+  t.pattern = 'spec/unit-suite/**/*_spec.rb'
+end
+
+desc "Unit-suite tests w/ doc"
+RSpec::Core::RakeTask.new(:unittest_fulldoc) do |t|
+  t.rspec_opts = ['--format=d','--out=unittest-suite-results.txt']
+  t.pattern = 'spec/unit-suite/**/*_spec.rb'
+end
+
+desc "Generate test results markdown"
+task :unittest_md => [:unittest_fulldoc] do
+  sh "outfn=unittest-suite-results.md;
+echo '## 'Unit test results - `date` > $outfn;
+echo '```' >> $outfn;
+cat unittest-suite-results.txt >> $outfn;
+echo '```' >> $outfn;
+"
+end

manifests/cli.pp

@@ -7,13 +7,18 @@
 #  include php::cli
 #
 class php::cli (
-  $ensure           = 'installed',
-  $inifile          = '/etc/php.ini',
-  $cli_package_name = $::php::params::cli_package_name,
-) inherits ::php::params {
-  package { $cli_package_name:
+  $ensure   = 'installed',
+  $inifile  = '/etc/php.ini',
+  $package  = undef,
+  ) {
+
+  include '::php::params'
+
+  $cli_package_name = $package ? {
+    undef   => $::php::params::cli_package_name,
+    default => $package,
+  }
+  package { $cli_package_name :
     ensure  => $ensure,
-    require => File[$inifile],
   }
 }
-

manifests/common.pp

@@ -5,6 +5,9 @@
 #
 # We can't use a virtual resource, since we have no central place to put it.
 #
-class php::common inherits ::php::params {
-  package { $common_package_name: ensure => 'installed' }
+class php::common {
+
+  include '::php::params'
+
+  package { $::php::params::common_package_name: ensure => 'installed' }
 }

manifests/fpm.pp

@@ -0,0 +1,128 @@
+# fpm.pp - 2014-02-19 07:36
+#
+# Copyright (c) 2014 Paul Houghton <[email protected]>
+#
+class php::fpm(
+  $wwwdir      = undef,
+  $php_modules = undef,
+  $appuser     = undef,
+  $appgroup    = undef,
+  $port        = undef,
+  $vhost       = 'localhost',
+  ) {
+
+  include '::php::params'
+
+  $directories = hiera('directories',{'www' => '/srv/www'})
+  $groups      = hiera('groups',{'www' => {'RedHat'=>'nginx','Debian'=>'www-data'}})
+  $ports       = hiera('ports',{'php-fpm' => '9000'})
+  $users       = hiera('users', { 'git' => 'git', 'gitlab' => 'git','www' => {'RedHat'=>'nginx','Debian'=>'www-data'} })
+
+  $basedir = $wwwdir ? {
+    undef   => $directories['www'],
+    default => $wwwdir,
+  }
+  $user = $appuser ? {
+    undef   => $users['www'][$::osfamily],
+    default => $appuser,
+  }
+  $group = $appgroup ? {
+    undef   => $groups['www'][$::osfamily],
+    default => $appgroup,
+  }
+  $pxyport = $port ? {
+    undef   => $ports['php-fpm'],
+    default => $port,
+  }
+
+  File {
+    owner   => $user,
+    group   => $group,
+  }
+
+  if $::osfamily == 'Debian' {
+    php::ini { '/etc/php5/fpm/php.ini':
+      display_errors  => 'On',
+      short_open_tag  => 'Off',
+      date_timezone   => 'America/Denver',
+      require         => Package[$::php::params::fpm_package_name],
+    }
+  }
+  if ! defined(Class['php::cli']) {
+    class { 'php::cli' : }
+  }
+  class { 'php::fpm::daemon' : }
+
+  php::fpm::conf { 'www' :
+    listen  => "127.0.0.1:${pxyport}",
+    user    => $user,
+    group   => $group,
+    require => User[$user],
+  }
+  if $php_modules {
+    php::module { $php_modules : }
+  }
+  $php_base_dir = $::osfamily ? {
+    'Debian'  => '/var/lib/php5',
+    default   => '/var/lib/php',
+  }
+  file { [$php_base_dir, "${php_base_dir}/session"] :
+    ensure  => 'directory',
+    mode    => '0775',
+    require => User[$user],
+  }
+
+  if $basedir {
+    file { "${basedir}/phpinfo.php" :
+      ensure  => 'file',
+      content => "<?php phpinfo(); ?>\n",
+      require => File[$basedir],
+    }
+  }
+  if ! defined(Class['nginx']) and $basedir {
+    class { 'nginx' : }
+    ensure_resource('file',$basedir,{
+      ensure  => 'directory',
+      owner   => $user,
+      group   => $group,
+      mode    => '0775',
+      require => Class['nginx'],
+    })
+    if $vhost {
+      nginx::resource::vhost { $vhost :
+        ensure   => 'present',
+        www_root => $basedir,
+      }
+    }
+  }
+
+  if $vhost and $basedir {
+    nginx::resource::location { 'php':
+      ensure          => 'present',
+      vhost           => $vhost,
+      location        => '~ \.php$',
+      www_root        => $basedir,
+      index_files     => undef,
+      proxy           => undef,
+      fastcgi         => "127.0.0.1:${pxyport}",
+    }
+
+    if $::selinux == 'true' {
+      ensure_resource('selboolean','httpd_can_network_connect',{
+        value => 'on',
+      })
+      # odd, this came up w/ fedora 20 port != 9000
+      ensure_resource('selboolean','nis_enabled',{
+        value => 'on',
+      })
+    }
+    # nginx::resource::location { 'static files':
+    #   ensure          => 'present',
+    #   vhost           => $vhost,
+    #   location        => '~ \.(css|gif|jpg|js|png|html)$',
+    #   www_root        => $basedir,
+    #   index_files     => ['index.php','index.html',],
+    #   proxy           => undef,
+    # }
+  }
+}

manifests/fpm/conf.pp

@@ -67,13 +67,12 @@
   if ( $ensure == 'absent' ) {
 
     file { "${php::params::fpm_pool_dir}/${pool}.conf":
-      notify  => Service[$php::params::fpm_service_name],
       ensure  => absent,
+      notify  => Service[$php::params::fpm_service_name],
       require => Package[$php::params::fpm_package_name],
     }
 
   } else {
-
     file { "${php::params::fpm_pool_dir}/${pool}.conf":
       notify  => Service[$php::params::fpm_service_name],
       content => template('php/fpm/pool.conf.erb'),
@@ -86,4 +85,3 @@
   }
 
 }
-

manifests/fpm/daemon.pp

@@ -16,44 +16,41 @@
   $log_owner                   = 'root',
   $log_group                   = false,
   $log_dir_mode                = '0770',
-) inherits ::php::params {
+  ) {
+
+  include '::php::params'
 
   # Hack-ish to default to user for group too
   $log_group_final = $log_group ? {
     false   => $log_owner,
     default => $log_group,
   }
 
-  package { $fpm_package_name: ensure => $ensure }
+  package { $::php::params::fpm_package_name: ensure => $ensure }
 
   if ( $ensure != 'absent' ) {
-    service { $fpm_service_name:
-      ensure    => running,
-      enable    => true,
-      restart   => "service ${fpm_service_name} reload",
-      hasstatus => true,
-      require   => Package[$fpm_package_name],
-    }
 
+    file { "${::php::params::fpm_conf_dir}/php-fpm.conf":
+      notify  => Service[$::php::params::fpm_service_name],
+      content => template('php/fpm/php-fpm.conf.erb'),
+      require => Package[$::php::params::fpm_package_name],
+    }
     # When running FastCGI, we don't always use the same user
     file { '/var/log/php-fpm':
       ensure  => directory,
       owner   => $log_owner,
       group   => $log_group_final,
       mode    => $log_dir_mode,
-      require => Package[$fpm_package_name],
+      require => Package[$::php::params::fpm_package_name],
     }
 
-    file { "${fpm_conf_dir}/php-fpm.conf":
-      notify  => Service[$fpm_service_name],
-      content => template('php/fpm/php-fpm.conf.erb'),
-      owner   => 'root',
-      group   => 'root',
-      mode    => 0644,
-      require => Package[$fpm_package_name],
+    service { $::php::params::fpm_service_name:
+      ensure    => running,
+      enable    => true,
+      restart   => "service ${::php::params::fpm_service_name} reload",
+      hasstatus => true,
+      require   => Package[$::php::params::fpm_package_name],
     }
 
   }
-
 }
-

manifests/ini.pp

@@ -109,10 +109,14 @@
 
   include '::php::common'
 
+  $ininotify = defined(Class['php::fpm::daemon']) ? {
+    true    => Service[$php::params::fpm_service_name],
+    default => undef,
+  }
   file { $title:
     ensure  => $ensure,
     content => template($template),
+    notify  => $ininotify,
   }
 
 }
-