Switch to ajcrowe/puppet-supervisord

.fixtures.yml

@@ -2,7 +2,7 @@ fixtures:
  repositories:
  stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
  nodejs: 'https://github.com/voxpupuli/puppet-nodejs.git'
- forge_modules:
- supervisor: 'proletaryo-supervisor'
+  supervisord: 'https://github.com/ajcrowe/puppet-supervisord'
+ concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
  symlinks:
  ghost: "#{source_dir}"

manifests/blog.pp

@@ -39,8 +39,8 @@
  Stdlib::HTTPSUrl $source = 'https://ghost.org/zip/ghost-latest.zip',
  Boolean $manage_npm_registry = true,
  Stdlib::HTTPSUrl $npm_registry = 'https://registry.npmjs.org/',
- Boolean $use_supervisor  = true,
- Boolean $autorestart = true,
+ Boolean $use_supervisord = true, # User supervisor module to setup service for blog
+ Boolean $autorestart = true, # Restart on crash
  Stdlib::Absolutepath $stdout_logfile = "/var/log/ghost_${title}.log",
  Stdlib::Absolutepath $stderr_logfile = "/var/log/ghost_${title}_err.log",
  Boolean $manage_config = true,
@@ -113,8 +113,8 @@
  }
  }
 
- if $use_supervisor {
- require supervisor
+ if $use_supervisord {
+ require supervisord
 
  case $::osfamily {
  'redhat': {
@@ -128,25 +128,16 @@
  }
  }
 
- Class['supervisor']
- -> supervisor::program { "ghost_${blog}":
- command => "node ${home}/index.js",
- autorestart => $autorestart,
- user => $user,
- group => $group,
- directory => $home,
- stdout_logfile => $stdout_logfile,
- stderr_logfile => $stderr_logfile,
- environment => 'NODE_ENV="production"',
- }
-
- ~> exec { 'supervisor::update':
- command => "${path_bin}/supervisorctl reread && ${path_bin}/supervisorctl update",
- user => 'root',
- group => 'root',
- logoutput => on_failure,
- refreshonly => true,
- require => Service['supervisord'],
+ Class['supervisord']
+ -> supervisord::program { "ghost_${blog}":
+ command => "node ${home}/index.js",
+ autorestart => $autorestart,
+ user => $user,
+ directory => $home,
+ stdout_logfile => $stdout_logfile,
+ stderr_logfile => $stderr_logfile,
+ program_environment => { 'NODE_ENV' => 'production' },
+ notify => Service['supervisord'],
  }
  }
 }

metadata.json

@@ -38,8 +38,8 @@
  "version_requirement": ">= 1.3.0 < 2.0.0"
  },
  {
- "name": "proletaryo/supervisor",
- "version_requirement": ">= 0.5.3 < 2.0.0"
+ "name": "ajcrowe/supervisord",
+ "version_requirement": ">= 0.6.0 < 1.0.0"
  }
  ]
 }

spec/defines/blog_spec.rb

@@ -3,7 +3,8 @@
  let :facts do
  {
  osfamily: 'Debian',
- lsbdistid: 'Ubuntu'
+ operatingsystem: 'Ubuntu',
+ operatingsystemmajrelease: '14.04'
  }
  end