freighthop 0.0.4 → 0.0.5

data/Puppetfile

@@ -1,6 +1,6 @@
 forge 'http://forge.puppetlabs.com'
 
-mod 'puppetlabs/stdlib'
+mod 'puppetlabs/stdlib', '4.1.0'
 mod 'puppetlabs/apt'
 mod 'gdsoperations/rbenv'
 mod 'nginx', :git => 'https://github.com/jfryman/puppet-nginx'

data/Puppetfile.lock

@@ -33,5 +33,5 @@ DEPENDENCIES
   nginx (>= 0)
   puppetlabs/apt (>= 0)
   puppetlabs/postgresql (>= 0)
-  puppetlabs/stdlib (>= 0)
+  puppetlabs/stdlib (= 4.1.0)
 

data/README.md

@@ -1,17 +1,16 @@
-# Freighthop: Vagrant on Rails
-
+# Freighthop: Hitch a Ride on Vagrant
 
 Don't you hate how your dev machine inevitably becomes the superset of all the dependencies of every project you ever worked on? Nobody wants to live in a war zone of data stores fighting for resources.
 
-Vagrant is suppose to help us with this. Package everything in virtual machines, and your life will be amazing! That's the idea at least; but the actual mechanics of getting to that promised land are not all that clear.
+Vagrant is supposed to help us with this. Package everything in virtual machines, and your life will be amazing! That's the idea at least; but the actual mechanics of getting to that promised land are not all that clear.
 
 ## What is Freighthop?
 
 Freighthop is based around this simple goal:
 
-> When I download a rails project, I want to run a single command that spins me up a VM serving that project.
+> When I download a project, I want to run a single command that spins me up a VM serving said project.
 
-With a few commands from the project root of any Rack-compatible app, Freighthop can spin up a VM that serves that project at `projectname.vagrant.dev`. Freighthop takes care of the bundle install, the server configuration, and the database, and it provides a helper executable that allows you to interact with the VM.
+With a few commands from the project root of any `{Ruby,Clojure}` web app, Freighthop can spin up a VM that serves that project at `projectname.vagrant.dev`. Freighthop takes care of package install, the server configuration, and the database, and it provides`fh`, a friendly helper executable that allows you to interact with the VM.
 
 ----
 
@@ -24,8 +23,6 @@ With a few commands from the project root of any Rack-compatible app, Freighthop
 
 ## Try it out
 
-This is a little involved at the moment (cuz alpha). Should simplify as the project evolves.
-
 ### Get the prerequisites
 
 * Vagrant 1.3.1
@@ -46,16 +43,10 @@ A Freighthop-enabled project just needs to include a `.freighthop.json` somethin
 
 ```json
 {
+  "freighthop::languages": ["ruby"],
   "freighthop::ruby_version": "2.0.0-p247",
-  "freighthop::databases": [
-    "myproject_development",
-    "myproject_test"
-  ],
-  "freighthop::database_users": [
-    "myproject"
-  ],
+  "freighthop::web_port": 9292,  
   "freighthop::packages": [
-    "git-core",
     "libpq-dev",
     "libsqlite3-dev",
     "libxml2-dev",
@@ -72,6 +63,8 @@ A Freighthop-enabled project just needs to include a `.freighthop.json` somethin
 fh up
 # run your migrations
 fh rake db:migrate
+# spin up your server
+fh run rackup
 ```
 
 ### Win
@@ -85,7 +78,7 @@ curl http://myproject.vagrant.dev
 ### Shut 'er down
 
 ```
-fh down
+fh halt
 ```
 
 And your host system is none the wiser! No databases lying around, no daemons hanging out forever in the background; squeaky clean!

data/lib/freighthop/config.rb

@@ -7,7 +7,7 @@ class Freighthop::Config
     @config = JSON.parse(file.read)
   end
 
-  def self.fetch(key)
-    config[key]
+  def self.fetch(*args)
+    config.fetch(*args)
   end
 end

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/freighthop.rb

@@ -41,7 +41,7 @@ module Freighthop
     end
 
     def mounts
-      Freighthop::Config.fetch("freighthop::mounts").map do |host, guest|
+      Freighthop::Config.fetch('freighthop::mounts', []).map do |host, guest|
         [
           File.expand_path(host_root.join(host)),
           File.expand_path(guest_root.join(guest)),

data/local_modules/freighthop/manifests/{postgres.pp → database/postgres.pp}

@@ -1,6 +1,6 @@
-class freighthop::postgres(
+class freighthop::database::postgres(
   $databases,
-  $database_users
+  $database_users,
 ) {
   include postgresql::server
 

data/local_modules/freighthop/manifests/database.pp

@@ -0,0 +1,12 @@
+class freighthop::database(
+  $database_flavors,
+  $databases,
+  $database_users
+) {
+  if (member($database_flavors, 'postgres')) {
+    class { 'freighthop::database::postgres':
+      databases      => $databases,
+      database_users => $database_users,
+    }
+  }
+}

data/local_modules/freighthop/manifests/init.pp

@@ -1,41 +1,42 @@
 class freighthop(
-  $databases,
-  $database_users,
-  $packages        = $freighthop::params::packages,
-  $ppas            = $freighthop::params::ppas,
-  $ruby_version    = $freighthop::params::ruby_version,
-  $app_name        = $freighthop::params::app_name,
-  $app_root        = $freighthop::params::app_root,
-  $web_root        = $freighthop::params::web_root,
-  $web_port        = $freighthop::params::web_port,
-  $server_name     = $freighthop::params::server_name,
-  $ssl_cert_path   = $freighthop::params::ssl_cert_path,
-  $ssl_key_path    = $freighthop::params::ssl_key_path,
+  $ppas             = $freighthop::params::ppas,
+  $packages         = $freighthop::params::packages,
+  $languages        = $freighthop::params::languages,
+  $database_flavors = $freighthop::params::database_flavors,
+  $databases        = $freighthop::params::databases,
+  $database_users   = $freighthop::params::database_users,
+  $ruby_version     = $freighthop::params::ruby_version,
+  $app_name         = $freighthop::params::app_name,
+  $app_root         = $freighthop::params::app_root,
+  $web_root         = $freighthop::params::web_root,
+  $web_port         = $freighthop::params::web_port,
+  $server_name      = $freighthop::params::server_name,
+  $ssl_cert_path    = $freighthop::params::ssl_cert_path,
+  $ssl_key_path     = $freighthop::params::ssl_key_path,
 ) inherits freighthop::params {
-  include apt
 
-  class { 'freighthop::ppas':
-    ppas => $ppas,
+  class { 'freighthop::packages':
+    ppas      => $ppas,
+    packages  => $packages,
+    languages => $languages,
   } ->
-  class { 'freighthop::pkgs':
-    packages => $packages,
-  } ->
-  class { 'freighthop::rbenv':
+
+  class { 'freighthop::language':
+    languages    => $languages,
     ruby_version => $ruby_version
   } ->
-  class { 'freighthop::nginx':
-    upstream_web_port  => $web_port,
-    server_name        => $server_name,
-    web_root           => $web_root,
-    ssl_cert_path      => $ssl_cert_path,
-    ssl_key_path       => $ssl_key_path,
-  } ->
-  class { 'freighthop::postgres':
-    databases      => $databases,
-    database_users => $database_users,
+
+  class { 'freighthop::web':
+    upstream_web_port => $web_port,
+    server_name       => $server_name,
+    web_root          => $web_root,
+    ssl_cert_path     => $ssl_cert_path,
+    ssl_key_path      => $ssl_key_path,
   } ->
-  class { 'freighthop::bundler':
-    ruby_version => $ruby_version,
-    app_root     => $app_root,
+
+  class { 'freighthop::database':
+    database_flavors => $database_flavors,
+    databases        => $databases,
+    database_users   => $database_users,
   }
 }

data/local_modules/freighthop/manifests/language/clojure.pp

@@ -0,0 +1,36 @@
+class freighthop::language::clojure(
+){
+  $lein_url = 'https://github.com/technomancy/leiningen/raw/stable/bin/lein'
+  $lein_home = '/usr/local/lein'
+
+  package { 'leiningen/java':
+    name => 'openjdk-6-jdk'
+  } ->
+
+  package { 'leiningen/install-wget':
+    name   => 'wget',
+  } ->
+
+  exec { 'leiningen/download-script':
+    cwd     => '/usr/local/bin',
+    command => "wget ${lein_url} && chmod 755 lein",
+    creates => '/usr/local/bin/lein',
+  } ->
+
+  file { '/etc/profile.d/leiningen.sh':
+    content => template('freighthop/profile/leiningen.sh.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+  }
+
+  Exec {
+    path => [
+      '/usr/local/bin',
+      '/usr/bin',
+      '/usr/sbin',
+      '/bin',
+      '/sbin',
+    ]
+  }
+}

data/{modules/freighthop/manifests/rbenv.pp → local_modules/freighthop/manifests/language/ruby.pp}

@@ -1,20 +1,20 @@
-class freighthop::rbenv(
-  $ruby_version
-) {
+class freighthop::language::ruby(
+  $version
+){
   class { '::rbenv':
-    global_version => $ruby_version,
+    global_version => $version,
   }
 
-  rbenv::version { $ruby_version: }
+  rbenv::version { $version: }
 
   # The rbenv puppet module drops $RBENV_ROOT/version but the package from
   # ppa:gds/govuk is an older version of rbenv that expects $RBENV_ROOT/global;
   # this is a workaround that uses the installed CLI to fix it.
   exec { 'fix-rbenv-global-version':
-    command     => "rbenv global ${ruby_version}",
-    unless      => "rbenv global | grep '${ruby_version}'",
+    command     => "rbenv global ${version}",
+    unless      => "rbenv global | grep '${version}'",
     environment => 'RBENV_ROOT=/usr/lib/rbenv',
-    require     => Rbenv::Version[$ruby_version]
+    require     => Rbenv::Version[$version]
   }
 
   Exec {

data/local_modules/freighthop/manifests/language.pp

@@ -0,0 +1,14 @@
+class freighthop::language(
+  $languages,
+  $ruby_version
+) {
+  if (member($languages, 'ruby')) {
+    class { 'freighthop::language::ruby':
+      version => $ruby_version,
+    }
+  }
+  if (member($languages, 'clojure')) {
+    class { 'freighthop::language::clojure':
+    }
+  }
+}

data/local_modules/freighthop/manifests/packages.pp

@@ -0,0 +1,22 @@
+class freighthop::packages(
+  $ppas,
+  $packages,
+  $languages,
+) {
+  if (member($languages, 'ruby')) {
+    apt::ppa { 'ppa:gds/govuk': }
+    apt::ppa { 'ppa:phinze/rbenv': }
+  }
+  apt::ppa { $ppas: }
+
+  package { [
+    'build-essential',
+    'git-core',
+  ]:
+    ensure => installed,
+  }
+
+  package { $packages:
+    ensure  => installed,
+  }
+}

data/local_modules/freighthop/manifests/params.pp

@@ -1,12 +1,16 @@
 class freighthop::params {
-  $packages        = ['git-core']
-  $ppas            = []
-  $ruby_version    = '1.9.3-p392'
-  $app_name        = $::hostname
-  $app_root        = "/srv/${app_name}"
-  $web_root        = "${app_root}/public"
-  $web_port        = 9292
-  $server_name     = $::fqdn
-  $ssl_cert_path   = "/etc/ssl/certs/${app_name}.pem"
-  $ssl_key_path    = "/etc/ssl/private/${app_name}.key"
+  $database_flavors = []
+  $databases        = []
+  $database_users   = []
+  $packages         = ['git-core']
+  $ppas             = []
+  $languages        = ['ruby']
+  $ruby_version     = '1.9.3-p392'
+  $app_name         = $::hostname
+  $app_root         = "/srv/${app_name}"
+  $web_root         = "${app_root}/public"
+  $web_port         = 3000
+  $server_name      = $::fqdn
+  $ssl_cert_path    = "/etc/ssl/certs/${app_name}.pem"
+  $ssl_key_path     = "/etc/ssl/private/${app_name}.key"
 }

data/{modules/freighthop/manifests/nginx.pp → local_modules/freighthop/manifests/web.pp}

@@ -1,11 +1,11 @@
-class freighthop::nginx(
+class freighthop::web(
   $upstream_web_port,
   $server_name,
   $web_root,
   $ssl_cert_path,
   $ssl_key_path,
 ) {
-  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Instructure/CN=${server_name}"
+  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Freighthop/CN=${server_name}"
 
   class {'::nginx':
     confd_purge => true

data/local_modules/freighthop/templates/profile/leiningen.sh.erb

@@ -0,0 +1,4 @@
+# Point freighhop-installed leiningen to its global home
+# And acknowledge that we're running everything as root
+export LEIN_HOME=<%= lein_home %>
+export LEIN_ROOT=1

data/modules/freighthop/manifests/{postgres.pp → database/postgres.pp}

@@ -1,6 +1,6 @@
-class freighthop::postgres(
+class freighthop::database::postgres(
   $databases,
-  $database_users
+  $database_users,
 ) {
   include postgresql::server
 

data/modules/freighthop/manifests/database.pp

@@ -0,0 +1,12 @@
+class freighthop::database(
+  $database_flavors,
+  $databases,
+  $database_users
+) {
+  if (member($database_flavors, 'postgres')) {
+    class { 'freighthop::database::postgres':
+      databases      => $databases,
+      database_users => $database_users,
+    }
+  }
+}

data/modules/freighthop/manifests/init.pp

@@ -1,41 +1,42 @@
 class freighthop(
-  $databases,
-  $database_users,
-  $packages        = $freighthop::params::packages,
-  $ppas            = $freighthop::params::ppas,
-  $ruby_version    = $freighthop::params::ruby_version,
-  $app_name        = $freighthop::params::app_name,
-  $app_root        = $freighthop::params::app_root,
-  $web_root        = $freighthop::params::web_root,
-  $web_port        = $freighthop::params::web_port,
-  $server_name     = $freighthop::params::server_name,
-  $ssl_cert_path   = $freighthop::params::ssl_cert_path,
-  $ssl_key_path    = $freighthop::params::ssl_key_path,
+  $ppas             = $freighthop::params::ppas,
+  $packages         = $freighthop::params::packages,
+  $languages        = $freighthop::params::languages,
+  $database_flavors = $freighthop::params::database_flavors,
+  $databases        = $freighthop::params::databases,
+  $database_users   = $freighthop::params::database_users,
+  $ruby_version     = $freighthop::params::ruby_version,
+  $app_name         = $freighthop::params::app_name,
+  $app_root         = $freighthop::params::app_root,
+  $web_root         = $freighthop::params::web_root,
+  $web_port         = $freighthop::params::web_port,
+  $server_name      = $freighthop::params::server_name,
+  $ssl_cert_path    = $freighthop::params::ssl_cert_path,
+  $ssl_key_path     = $freighthop::params::ssl_key_path,
 ) inherits freighthop::params {
-  include apt
 
-  class { 'freighthop::ppas':
-    ppas => $ppas,
+  class { 'freighthop::packages':
+    ppas      => $ppas,
+    packages  => $packages,
+    languages => $languages,
   } ->
-  class { 'freighthop::pkgs':
-    packages => $packages,
-  } ->
-  class { 'freighthop::rbenv':
+
+  class { 'freighthop::language':
+    languages    => $languages,
     ruby_version => $ruby_version
   } ->
-  class { 'freighthop::nginx':
-    upstream_web_port  => $web_port,
-    server_name        => $server_name,
-    web_root           => $web_root,
-    ssl_cert_path      => $ssl_cert_path,
-    ssl_key_path       => $ssl_key_path,
-  } ->
-  class { 'freighthop::postgres':
-    databases      => $databases,
-    database_users => $database_users,
+
+  class { 'freighthop::web':
+    upstream_web_port => $web_port,
+    server_name       => $server_name,
+    web_root          => $web_root,
+    ssl_cert_path     => $ssl_cert_path,
+    ssl_key_path      => $ssl_key_path,
   } ->
-  class { 'freighthop::bundler':
-    ruby_version => $ruby_version,
-    app_root     => $app_root,
+
+  class { 'freighthop::database':
+    database_flavors => $database_flavors,
+    databases        => $databases,
+    database_users   => $database_users,
   }
 }

data/modules/freighthop/manifests/language/clojure.pp

@@ -0,0 +1,36 @@
+class freighthop::language::clojure(
+){
+  $lein_url = 'https://github.com/technomancy/leiningen/raw/stable/bin/lein'
+  $lein_home = '/usr/local/lein'
+
+  package { 'leiningen/java':
+    name => 'openjdk-6-jdk'
+  } ->
+
+  package { 'leiningen/install-wget':
+    name   => 'wget',
+  } ->
+
+  exec { 'leiningen/download-script':
+    cwd     => '/usr/local/bin',
+    command => "wget ${lein_url} && chmod 755 lein",
+    creates => '/usr/local/bin/lein',
+  } ->
+
+  file { '/etc/profile.d/leiningen.sh':
+    content => template('freighthop/profile/leiningen.sh.erb'),
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0755',
+  }
+
+  Exec {
+    path => [
+      '/usr/local/bin',
+      '/usr/bin',
+      '/usr/sbin',
+      '/bin',
+      '/sbin',
+    ]
+  }
+}

data/{local_modules/freighthop/manifests/rbenv.pp → modules/freighthop/manifests/language/ruby.pp}

@@ -1,20 +1,20 @@
-class freighthop::rbenv(
-  $ruby_version
-) {
+class freighthop::language::ruby(
+  $version
+){
   class { '::rbenv':
-    global_version => $ruby_version,
+    global_version => $version,
   }
 
-  rbenv::version { $ruby_version: }
+  rbenv::version { $version: }
 
   # The rbenv puppet module drops $RBENV_ROOT/version but the package from
   # ppa:gds/govuk is an older version of rbenv that expects $RBENV_ROOT/global;
   # this is a workaround that uses the installed CLI to fix it.
   exec { 'fix-rbenv-global-version':
-    command     => "rbenv global ${ruby_version}",
-    unless      => "rbenv global | grep '${ruby_version}'",
+    command     => "rbenv global ${version}",
+    unless      => "rbenv global | grep '${version}'",
     environment => 'RBENV_ROOT=/usr/lib/rbenv',
-    require     => Rbenv::Version[$ruby_version]
+    require     => Rbenv::Version[$version]
   }
 
   Exec {

data/modules/freighthop/manifests/language.pp

@@ -0,0 +1,14 @@
+class freighthop::language(
+  $languages,
+  $ruby_version
+) {
+  if (member($languages, 'ruby')) {
+    class { 'freighthop::language::ruby':
+      version => $ruby_version,
+    }
+  }
+  if (member($languages, 'clojure')) {
+    class { 'freighthop::language::clojure':
+    }
+  }
+}

data/modules/freighthop/manifests/packages.pp

@@ -0,0 +1,22 @@
+class freighthop::packages(
+  $ppas,
+  $packages,
+  $languages,
+) {
+  if (member($languages, 'ruby')) {
+    apt::ppa { 'ppa:gds/govuk': }
+    apt::ppa { 'ppa:phinze/rbenv': }
+  }
+  apt::ppa { $ppas: }
+
+  package { [
+    'build-essential',
+    'git-core',
+  ]:
+    ensure => installed,
+  }
+
+  package { $packages:
+    ensure  => installed,
+  }
+}

data/modules/freighthop/manifests/params.pp

@@ -1,12 +1,16 @@
 class freighthop::params {
-  $packages        = ['git-core']
-  $ppas            = []
-  $ruby_version    = '1.9.3-p392'
-  $app_name        = $::hostname
-  $app_root        = "/srv/${app_name}"
-  $web_root        = "${app_root}/public"
-  $web_port        = 9292
-  $server_name     = $::fqdn
-  $ssl_cert_path   = "/etc/ssl/certs/${app_name}.pem"
-  $ssl_key_path    = "/etc/ssl/private/${app_name}.key"
+  $database_flavors = []
+  $databases        = []
+  $database_users   = []
+  $packages         = ['git-core']
+  $ppas             = []
+  $languages        = ['ruby']
+  $ruby_version     = '1.9.3-p392'
+  $app_name         = $::hostname
+  $app_root         = "/srv/${app_name}"
+  $web_root         = "${app_root}/public"
+  $web_port         = 3000
+  $server_name      = $::fqdn
+  $ssl_cert_path    = "/etc/ssl/certs/${app_name}.pem"
+  $ssl_key_path     = "/etc/ssl/private/${app_name}.key"
 }

data/{local_modules/freighthop/manifests/nginx.pp → modules/freighthop/manifests/web.pp}

@@ -1,11 +1,11 @@
-class freighthop::nginx(
+class freighthop::web(
   $upstream_web_port,
   $server_name,
   $web_root,
   $ssl_cert_path,
   $ssl_key_path,
 ) {
-  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Instructure/CN=${server_name}"
+  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Freighthop/CN=${server_name}"
 
   class {'::nginx':
     confd_purge => true

data/modules/freighthop/templates/profile/leiningen.sh.erb

@@ -0,0 +1,4 @@
+# Point freighhop-installed leiningen to its global home
+# And acknowledge that we're running everything as root
+export LEIN_HOME=<%= lein_home %>
+export LEIN_ROOT=1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighthop
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,20 +134,17 @@ files:
 - lib/freighthop.rb
 - lib/freighthop/config.rb
 - lib/freighthop/version.rb
-- local_modules/freighthop/files/bundler/freighthop.gemfile
-- local_modules/freighthop/manifests/bundler.pp
+- local_modules/freighthop/manifests/database.pp
+- local_modules/freighthop/manifests/database/postgres.pp
 - local_modules/freighthop/manifests/init.pp
-- local_modules/freighthop/manifests/nginx.pp
+- local_modules/freighthop/manifests/language.pp
+- local_modules/freighthop/manifests/language/clojure.pp
+- local_modules/freighthop/manifests/language/ruby.pp
+- local_modules/freighthop/manifests/packages.pp
 - local_modules/freighthop/manifests/params.pp
-- local_modules/freighthop/manifests/pkgs.pp
-- local_modules/freighthop/manifests/postgres.pp
-- local_modules/freighthop/manifests/ppas.pp
-- local_modules/freighthop/manifests/rbenv.pp
-- local_modules/freighthop/manifests/redis.pp
+- local_modules/freighthop/manifests/web.pp
 - local_modules/freighthop/templates/nginx/vagrant-rails.conf.erb
-- local_modules/freighthop/templates/profile/custom_bundler_gemfile.sh.erb
-- local_modules/freighthop/templates/puma/upstart/puma-manager.conf.erb
-- local_modules/freighthop/templates/puma/upstart/puma.conf.erb
+- local_modules/freighthop/templates/profile/leiningen.sh.erb
 - manifests/site.pp
 - modules/apt/CHANGELOG
 - modules/apt/Gemfile
@@ -264,20 +261,17 @@ files:
 - modules/firewall/spec/unit/puppet/type/firewallchain_spec.rb
 - modules/firewall/spec/unit/puppet/util/firewall_spec.rb
 - modules/firewall/spec/unit/puppet/util/ipcidr_spec.rb
-- modules/freighthop/files/bundler/freighthop.gemfile
-- modules/freighthop/manifests/bundler.pp
+- modules/freighthop/manifests/database/postgres.pp
+- modules/freighthop/manifests/database.pp
 - modules/freighthop/manifests/init.pp
-- modules/freighthop/manifests/nginx.pp
+- modules/freighthop/manifests/language/clojure.pp
+- modules/freighthop/manifests/language/ruby.pp
+- modules/freighthop/manifests/language.pp
+- modules/freighthop/manifests/packages.pp
 - modules/freighthop/manifests/params.pp
-- modules/freighthop/manifests/pkgs.pp
-- modules/freighthop/manifests/postgres.pp
-- modules/freighthop/manifests/ppas.pp
-- modules/freighthop/manifests/rbenv.pp
-- modules/freighthop/manifests/redis.pp
+- modules/freighthop/manifests/web.pp
 - modules/freighthop/templates/nginx/vagrant-rails.conf.erb
-- modules/freighthop/templates/profile/custom_bundler_gemfile.sh.erb
-- modules/freighthop/templates/puma/upstart/puma-manager.conf.erb
-- modules/freighthop/templates/puma/upstart/puma.conf.erb
+- modules/freighthop/templates/profile/leiningen.sh.erb
 - modules/nginx/ChangeLog
 - modules/nginx/composer.json
 - modules/nginx/Gemfile
@@ -658,7 +652,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3032814133313184341
+      hash: -2753549700317476048
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -667,7 +661,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3032814133313184341
+      hash: -2753549700317476048
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/local_modules/freighthop/files/bundler/freighthop.gemfile

@@ -1,3 +0,0 @@
-eval(File.read('Gemfile'))
-
-gem 'puma'

data/local_modules/freighthop/manifests/bundler.pp

@@ -1,34 +0,0 @@
-class freighthop::bundler(
-  $ruby_version,
-  $app_root,
-){
-  file { "${app_root}/.freighthop.gemfile":
-    ensure => 'file',
-    mode   => '0644',
-    source => 'puppet:///modules/freighthop/bundler/freighthop.gemfile',
-  }
-
-  file { '/etc/profile.d/custom_bundler_gemfile.sh':
-    ensure  => present,
-    mode    => '0755',
-    content => template('freighthop/profile/custom_bundler_gemfile.sh.erb'),
-  }
-
-  exec { 'bundle install':
-    environment => [
-      'BUNDLE_GEMFILE=.freighthop.gemfile',
-      'RBENV_ROOT=/usr/lib/rbenv',
-      "RBENV_VERSION=${ruby_version}",
-    ],
-    cwd         => $app_root,
-    path        => [
-      '/usr/lib/rbenv/shims',
-      '/usr/bin',
-      '/bin',
-    ],
-    logoutput   => true,
-    timeout     => 0,
-    unless      => 'bundle check',
-    require     => File["${app_root}/.freighthop.gemfile"],
-  }
-}

data/local_modules/freighthop/manifests/pkgs.pp

@@ -1,7 +0,0 @@
-class freighthop::pkgs(
-  $packages
-) {
-  package { $packages:
-    ensure  => installed,
-  }
-}

data/local_modules/freighthop/manifests/ppas.pp

@@ -1,9 +0,0 @@
-class freighthop::ppas(
-  $ppas
-) {
-  # required ppas
-  apt::ppa { 'ppa:gds/govuk': }
-  apt::ppa { 'ppa:phinze/rbenv': }
-
-  apt::ppa { $ppas: }
-}

data/local_modules/freighthop/manifests/redis.pp

@@ -1,9 +0,0 @@
-class freighthop::redis {
-  package { 'redis-server':
-    ensure => installed
-  }
-  service { 'redis-server':
-    ensure  => running,
-    require => Package['redis-server']
-  }
-}

data/local_modules/freighthop/templates/profile/custom_bundler_gemfile.sh.erb

@@ -1 +0,0 @@
-export BUNDLE_GEMFILE=.freighthop.gemfile

data/local_modules/freighthop/templates/puma/upstart/puma-manager.conf.erb

@@ -1,33 +0,0 @@
-# /etc/init/puma-manager.conf - manage a set of Pumas
-
-# This example config should work with Ubuntu 12.04+.  It
-# allows you to manage multiple Puma instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See puma.conf for how to manage a single Puma instance.
-#
-# Use "stop puma-manager" to stop all Puma instances.
-# Use "start puma-manager" to start all instances.
-# Use "restart puma-manager" to restart all instances.
-# Crazy, right?
-#
-
-description "Manages the set of puma processes"
-
-# This starts upon bootup and stops on shutdown
-start on (filesystem
-  and mounted MOUNTPOINT=<%= app_root %>
-  and runlevel [2345])
-stop on runlevel [06]
-
-# Set this to the number of Puma processes you want
-# to run on this machine
-env PUMA_CONF="/etc/puma.conf"
-
-pre-start script
-  for i in `cat $PUMA_CONF`; do
-    app=`echo $i | cut -d , -f 1`
-    logger -t "puma-manager" "Starting $app"
-    start puma app=$app
-  done
-end script

data/local_modules/freighthop/templates/puma/upstart/puma.conf.erb

@@ -1,53 +0,0 @@
-# /etc/init/puma.conf - Puma config
-
-# This example config should work with Ubuntu 12.04+.  It
-# allows you to manage multiple Puma instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See workers.conf for how to manage all Puma instances at once.
-#
-# Save this config as /etc/init/puma.conf then manage puma with:
-#   sudo start puma app=PATH_TO_APP
-#   sudo stop puma app=PATH_TO_APP
-#   sudo status puma app=PATH_TO_APP
-#
-# or use the service command:
-#   sudo service puma {start,stop,restart,status}
-#
-
-description "Puma Background Worker"
-
-# no "start on", we don't want to automatically start
-stop on (stopping puma-manager or runlevel [06])
-
-# change apps to match your deployment user if you want to use this as a less privileged user (recommended!)
-# setuid vagrant
-# setgid vagrant
-
-respawn
-respawn limit 3 30
-
-instance ${app}
-
-script
-# this script runs in /bin/sh by default
-# respawn as bash so we can source in rbenv/rvm
-# quoted heredoc to tell /bin/sh not to interpret
-# variables
-exec /bin/bash <<'EOT'
-  # set HOME to the setuid user's home, there doesn't seem to be a better, portable way
-  export HOME="$(eval echo ~$(id -un))"
-
-  cd $app
-
-  source /etc/profile.d/rbenv.sh
-
-  source /etc/profile.d/custom_bundler_gemfile.sh
-
-  logger -t puma "Starting server: $app"
-
-  mkdir -p <%= socket_dir %>
-
-  exec bundle exec puma -b unix://<%= socket_path %>
-EOT
-end script

data/modules/freighthop/files/bundler/freighthop.gemfile

@@ -1,3 +0,0 @@
-eval(File.read('Gemfile'))
-
-gem 'puma'

data/modules/freighthop/manifests/bundler.pp

@@ -1,34 +0,0 @@
-class freighthop::bundler(
-  $ruby_version,
-  $app_root,
-){
-  file { "${app_root}/.freighthop.gemfile":
-    ensure => 'file',
-    mode   => '0644',
-    source => 'puppet:///modules/freighthop/bundler/freighthop.gemfile',
-  }
-
-  file { '/etc/profile.d/custom_bundler_gemfile.sh':
-    ensure  => present,
-    mode    => '0755',
-    content => template('freighthop/profile/custom_bundler_gemfile.sh.erb'),
-  }
-
-  exec { 'bundle install':
-    environment => [
-      'BUNDLE_GEMFILE=.freighthop.gemfile',
-      'RBENV_ROOT=/usr/lib/rbenv',
-      "RBENV_VERSION=${ruby_version}",
-    ],
-    cwd         => $app_root,
-    path        => [
-      '/usr/lib/rbenv/shims',
-      '/usr/bin',
-      '/bin',
-    ],
-    logoutput   => true,
-    timeout     => 0,
-    unless      => 'bundle check',
-    require     => File["${app_root}/.freighthop.gemfile"],
-  }
-}

data/modules/freighthop/manifests/pkgs.pp

@@ -1,7 +0,0 @@
-class freighthop::pkgs(
-  $packages
-) {
-  package { $packages:
-    ensure  => installed,
-  }
-}

data/modules/freighthop/manifests/ppas.pp

@@ -1,9 +0,0 @@
-class freighthop::ppas(
-  $ppas
-) {
-  # required ppas
-  apt::ppa { 'ppa:gds/govuk': }
-  apt::ppa { 'ppa:phinze/rbenv': }
-
-  apt::ppa { $ppas: }
-}

data/modules/freighthop/manifests/redis.pp

@@ -1,9 +0,0 @@
-class freighthop::redis {
-  package { 'redis-server':
-    ensure => installed
-  }
-  service { 'redis-server':
-    ensure  => running,
-    require => Package['redis-server']
-  }
-}

data/modules/freighthop/templates/profile/custom_bundler_gemfile.sh.erb

@@ -1 +0,0 @@
-export BUNDLE_GEMFILE=.freighthop.gemfile

data/modules/freighthop/templates/puma/upstart/puma-manager.conf.erb

@@ -1,33 +0,0 @@
-# /etc/init/puma-manager.conf - manage a set of Pumas
-
-# This example config should work with Ubuntu 12.04+.  It
-# allows you to manage multiple Puma instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See puma.conf for how to manage a single Puma instance.
-#
-# Use "stop puma-manager" to stop all Puma instances.
-# Use "start puma-manager" to start all instances.
-# Use "restart puma-manager" to restart all instances.
-# Crazy, right?
-#
-
-description "Manages the set of puma processes"
-
-# This starts upon bootup and stops on shutdown
-start on (filesystem
-  and mounted MOUNTPOINT=<%= app_root %>
-  and runlevel [2345])
-stop on runlevel [06]
-
-# Set this to the number of Puma processes you want
-# to run on this machine
-env PUMA_CONF="/etc/puma.conf"
-
-pre-start script
-  for i in `cat $PUMA_CONF`; do
-    app=`echo $i | cut -d , -f 1`
-    logger -t "puma-manager" "Starting $app"
-    start puma app=$app
-  done
-end script

data/modules/freighthop/templates/puma/upstart/puma.conf.erb

@@ -1,53 +0,0 @@
-# /etc/init/puma.conf - Puma config
-
-# This example config should work with Ubuntu 12.04+.  It
-# allows you to manage multiple Puma instances with
-# Upstart, Ubuntu's native service management tool.
-#
-# See workers.conf for how to manage all Puma instances at once.
-#
-# Save this config as /etc/init/puma.conf then manage puma with:
-#   sudo start puma app=PATH_TO_APP
-#   sudo stop puma app=PATH_TO_APP
-#   sudo status puma app=PATH_TO_APP
-#
-# or use the service command:
-#   sudo service puma {start,stop,restart,status}
-#
-
-description "Puma Background Worker"
-
-# no "start on", we don't want to automatically start
-stop on (stopping puma-manager or runlevel [06])
-
-# change apps to match your deployment user if you want to use this as a less privileged user (recommended!)
-# setuid vagrant
-# setgid vagrant
-
-respawn
-respawn limit 3 30
-
-instance ${app}
-
-script
-# this script runs in /bin/sh by default
-# respawn as bash so we can source in rbenv/rvm
-# quoted heredoc to tell /bin/sh not to interpret
-# variables
-exec /bin/bash <<'EOT'
-  # set HOME to the setuid user's home, there doesn't seem to be a better, portable way
-  export HOME="$(eval echo ~$(id -un))"
-
-  cd $app
-
-  source /etc/profile.d/rbenv.sh
-
-  source /etc/profile.d/custom_bundler_gemfile.sh
-
-  logger -t puma "Starting server: $app"
-
-  mkdir -p <%= socket_dir %>
-
-  exec bundle exec puma -b unix://<%= socket_path %>
-EOT
-end script