freighthop 0.2.1 → 0.3.0

data/Puppetfile

@@ -2,8 +2,9 @@ forge 'http://forge.puppetlabs.com'
 
 mod 'puppetlabs/stdlib', '4.1.0'
 mod 'puppetlabs/apt'
-mod 'gdsoperations/rbenv'
-mod 'nginx', :git => 'https://github.com/jfryman/puppet-nginx'
+mod 'alup/rbenv'
+mod 'nginx', git: 'https://github.com/jfryman/puppet-nginx'
 mod 'puppetlabs/postgresql'
 mod 'puppetlabs/mysql'
-mod 'freighthop', :path => 'local_modules/freighthop'
+mod 'apache', git: 'https://github.com/puppetlabs/puppetlabs-apache'
+mod 'freighthop', path: 'local_modules/freighthop'

data/Puppetfile.lock

@@ -1,9 +1,11 @@
 FORGE
   remote: http://forge.puppetlabs.com
   specs:
-    gdsoperations/rbenv (1.0.1)
+    alup/rbenv (1.2.0)
     puppetlabs/apt (1.2.0)
       puppetlabs/stdlib (>= 2.2.1)
+    puppetlabs/concat (1.1.0-rc1)
+      puppetlabs/stdlib (>= 3.0.0)
     puppetlabs/firewall (0.4.2)
     puppetlabs/mysql (2.0.1)
       puppetlabs/stdlib (>= 2.2.1)
@@ -24,14 +26,24 @@ GIT
       puppetlabs/apt (>= 1.0.0)
       puppetlabs/stdlib (>= 0.1.6)
 
+GIT
+  remote: https://github.com/puppetlabs/puppetlabs-apache
+  ref: master
+  sha: 739f2a69fe43413349f90f1ba7b95ae3bdc1b02a
+  specs:
+    apache (0.10.0)
+      puppetlabs/concat (>= 1.0.0)
+      puppetlabs/stdlib (>= 2.4.0)
+
 PATH
   remote: local_modules/freighthop
   specs:
     freighthop (0.0.1)
 
 DEPENDENCIES
+  alup/rbenv (>= 0)
+  apache (>= 0)
   freighthop (>= 0)
-  gdsoperations/rbenv (>= 0)
   nginx (>= 0)
   puppetlabs/apt (>= 0)
   puppetlabs/mysql (>= 0)

data/Vagrantfile

@@ -15,6 +15,8 @@ Vagrant.configure('2') do |config|
   config.cache.auto_detect = true
   config.cache.enable_nfs = Freighthop.nfs?
 
+  config.ssh.forward_agent = true
+
   config.vm.define Freighthop.app_name do |node_config|
     node_config.vm.hostname = Freighthop.hostname
 
@@ -57,7 +59,9 @@ Vagrant.configure('2') do |config|
       puppet.module_path = 'modules'
       puppet.manifest_file = 'site.pp'
       puppet.facter = {
-        'app_name' => Freighthop.app_name
+        'app_name'       => Freighthop.app_name,
+        'freighthop_uid' => Process.uid,
+        'freighthop_gid' => Process.gid,
       }
     end
   end

data/data/common.json

@@ -1,5 +1,6 @@
 {
-  "classes": [
-    "freighthop"
-  ]
+  "classes": ["freighthop"],
+  "freighthop::ppas": [],
+  "freighthop::packages": ["build-essential", "git"],
+  "freighthop::languages": []
 }

data/freighthop.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-shell'
 
   spec.add_development_dependency 'puppet'
-  spec.add_development_dependency 'librarian-puppet'
+  spec.add_development_dependency 'librarian-puppet', '~> 0.9.10'
   spec.add_development_dependency 'json'
 end

data/lib/freighthop/cli/checks.rb

@@ -0,0 +1,12 @@
+class Freighthop::CLI::Checks
+  def self.ensure_config_exists!
+    unless Freighthop::Config.exist?
+      puts <<-NO_CONFIG
+ERROR: No freighthop config file (.freighthop.json) found in current path.
+       You can generate a template config with `fh init`, or see `fh help`
+       for more information.
+      NO_CONFIG
+      exit 1
+    end
+  end
+end

data/lib/freighthop/cli/help.rb

@@ -29,6 +29,7 @@ SYNOPSIS
   fh <COMMAND> [args...]
 
 BUILT-IN COMMANDS
+  init      - create a template freighthop config in the current dir
   up        - boot freighthop vm
   halt      - shutdown freighthop vm
   destroy   - shutdown and delete vm
@@ -50,6 +51,12 @@ PASSTHROUGH TO VM
   them to behave properly.
 
 EXAMPLES
+  Get started with a fresh config:
+    fh init
+
+  Boot your Freighthop-managed VM:
+    fh up
+
   Install gem dependencies:
     fh bundle install
 

data/lib/freighthop/cli/init.rb

@@ -0,0 +1,35 @@
+class Freighthop::CLI::Init
+  def self.match?(*args)
+    args.first == 'init'
+  end
+
+  attr_reader :language
+
+  def initialize(*args)
+  end
+
+  def run
+    if Freighthop::Config.exist?
+      puts "This directory already contains a #{Freighthop::Config.file.basename}"
+      exit 1
+    end
+
+    puts "Writing a new config to #{Freighthop::Config.file.basename}"
+    Freighthop::Config.write(default_config)
+  end
+
+  def default_config
+    {
+      'freighthop::cpus'                         => 2,
+      'freighthop::ram'                          => 512,
+      'freighthop::languages'                    => ['ruby'],
+      'freighthop::web::servers'                 => ['nginx'],
+      'freighthop::web::nginx::upstream_port'    => 3000,
+      'freighthop::database::servers'            => ['postgres'],
+      'freighthop::database::postgres::db_names' => [],
+      'freighthop::database::postgres::users'    => [],
+      'freighthop::ppas'                         => [],
+      'freighthop::packages'                     => [],
+    }
+  end
+end

data/lib/freighthop/cli/ssh.rb

@@ -8,6 +8,7 @@ class Freighthop::CLI::SSH
   end
 
   def run
+    Freighthop::CLI::Checks.ensure_config_exists!
     if shell?
       ssh('-i')
     else

data/lib/freighthop/cli/vagrant.rb

@@ -21,6 +21,7 @@ class Freighthop::CLI::Vagrant
   end
 
   def run
+    Freighthop::CLI::Checks.ensure_config_exists!
     exec %Q(vagrant #{@subcommand} #{args})
   end
 end

data/lib/freighthop/cli.rb

@@ -1,12 +1,15 @@
 class Freighthop::CLI; end
 
+require_relative 'cli/checks'
 require_relative 'cli/help'
+require_relative 'cli/init'
 require_relative 'cli/ssh'
 require_relative 'cli/vagrant'
 
 class Freighthop::CLI
   COMMANDS = [
     Freighthop::CLI::Help,
+    Freighthop::CLI::Init,
     Freighthop::CLI::Vagrant,
     Freighthop::CLI::SSH,
   ]
@@ -16,25 +19,10 @@ class Freighthop::CLI
   end
 
   def run
-    sanity_check
     Freighthop::VagrantEnv.activate!
 
-    command = COMMANDS.detect(lambda{self.help}) { |c| c.match?(*@args) }
+    command = COMMANDS.detect { |c| c.match?(*@args) }
+    # no need for a nil check, because CLI::SSH will always match
     command.new(*@args).run
   end
-
-  def help
-    Freighthop::CLI::Help
-  end
-
-  def sanity_check
-    return if help.match?(*@args)
-    unless Freighthop::Config.exist?
-      puts <<-NO_CONFIG
-ERROR: No freighthop config file (.freighthop.json) found in current path.
-       You probably want to check out the README and/or `fh help`.
-      NO_CONFIG
-      exit 1
-    end
-  end
 end

data/lib/freighthop/config.rb

@@ -8,10 +8,14 @@ class Freighthop::Config
   end
 
   def self.config
-    @config = JSON.parse(file.read)
+    @config ||= JSON.parse(file.read)
   end
 
   def self.fetch(*args)
     config.fetch(*args)
   end
+
+  def self.write(config_hash)
+    file.open('w') { |f| f.puts(JSON.pretty_generate(config_hash)) }
+  end
 end

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/freighthop.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'json'
 
 require_relative 'freighthop/version'
 require_relative 'freighthop/config'
@@ -34,7 +35,11 @@ module Freighthop
     # For now only use NFS on vmware to work around this issue:
     # https://github.com/phinze/landrush/issues/17
     def nfs?
-      vmware?
+      if ENV.key? 'FREIGHTHOP_NFS'
+        ['1','true','on'].include?(ENV['FREIGHTHOP_NFS'])
+      else
+        vmware?
+      end
     end
 
     def box_url

data/local_modules/freighthop/manifests/database/mysql/grant.pp

@@ -0,0 +1,11 @@
+define freighthop::database::mysql::grant(
+  $user
+) {
+  mysql_grant { "freighthop_mysql_grant_for_${user}":
+    ensure     => 'present',
+    options    => ['GRANT'],
+    privileges => ['ALL'],
+    table      => '*.*',
+    user       => "${user}@%",
+  }
+}

data/local_modules/freighthop/manifests/database/mysql.pp

@@ -1,20 +1,10 @@
 class freighthop::database::mysql(
-  $db_names,
+  $databases,
   $users,
 ) {
   include mysql::server
+  include mysql::client
 
-  mysql::db{$db_names:
-    user => "notorious",
-    password => "notorious",
-    host => "localhost",
-    grant => ['All']
-  }
-  mysql_grant { $users:
-    ensure     => 'present',
-    options    => ['GRANT'],
-    privileges => ['ALL'],
-    table      => '*.*',
-    user       => 'notorious@%',
-  }
-}
+  mysql_database { $databases: } ->
+  freighthop::database::mysql::grant { $users: }
+}

data/local_modules/freighthop/manifests/database/postgres.pp

@@ -1,5 +1,5 @@
 class freighthop::database::postgres(
-  $db_names,
+  $databases,
   $users,
 ) {
   include postgresql::server
@@ -19,7 +19,7 @@ class freighthop::database::postgres(
     auth_method => 'trust',
     order       => '0001',
   }
-  postgresql::server::database { $db_names: }
+  postgresql::server::database { $databases: }
   postgresql::server::role { $users:
     superuser     => true,
     createdb      => true,

data/local_modules/freighthop/manifests/database.pp

@@ -1,10 +1,10 @@
 class freighthop::database(
-  $flavors = []
+  $servers = []
 ) {
-  if (member($flavors, 'postgres')) {
+  if member($servers, 'postgres') {
     class { 'freighthop::database::postgres':}
   }
-  if (member($flavors, 'mysql')) {
+  if member($servers, 'mysql') {
     class { 'freighthop::database::mysql':}
   }
 }

data/local_modules/freighthop/manifests/init.pp

@@ -1,35 +1,18 @@
 class freighthop(
-  $ppas             = $freighthop::params::ppas,
-  $packages         = $freighthop::params::packages,
-  $languages        = $freighthop::params::languages,
-  $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 {
-
+  $ppas,
+  $packages,
+  $languages,
+) {
+  class { 'freighthop::params': } ->
   class { 'freighthop::packages':
     ppas      => $ppas,
     packages  => $packages,
-    languages => $languages,
   } ->
 
   class { 'freighthop::language':
     languages    => $languages,
-    ruby_version => $ruby_version
-  } ->
-
-  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::web': } ->
   class { 'freighthop::database':}
 }

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

@@ -1,29 +1,9 @@
 class freighthop::language::ruby(
-  $version
+  $version = $freighthop::params::ruby_version
 ){
-  class { '::rbenv':
-    global_version => $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 ${version}",
-    unless      => "rbenv global | grep '${version}'",
-    environment => 'RBENV_ROOT=/usr/lib/rbenv',
-    require     => Rbenv::Version[$version]
-  }
-
-  Exec {
-    path => [
-      '/usr/local/bin',
-      '/usr/bin',
-      '/usr/sbin',
-      '/bin',
-      '/sbin',
-    ]
+  rbenv::install { 'vagrant': }
+  rbenv::compile { $version:
+    global => true,
+    user   => 'vagrant',
   }
 }

data/local_modules/freighthop/manifests/language.pp

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

data/local_modules/freighthop/manifests/packages.pp

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

data/local_modules/freighthop/manifests/params.pp

@@ -1,13 +1,21 @@
 class freighthop::params {
-  $packages         = []
-  $ppas             = []
-  $languages        = []
-  $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"
+  $packages                = []
+  $ppas                    = []
+  $languages               = []
+  $ruby_version            = '1.9.3-p392'
+  $app_name                = $::hostname
+  $app_root                = "/srv/${app_name}"
+  $web_servers             = ['nginx']
+  $web_root                = "${app_root}/public"
+  $http_port               = 80
+  $https_port              = 443
+  $upstream_port           = 3000
+  $server_name             = $::fqdn
+  $ssl                     = true
+  $ssl_cert_path           = "/etc/ssl/certs/${app_name}.pem"
+  $ssl_key_path            = "/etc/ssl/private/${app_name}.key"
+  $uid                     = $::freighthop_uid
+  $gid                     = $::freighthop_gid
+  $passenger               = false
+  $passenger_buffer_upload = false
 }

data/local_modules/freighthop/manifests/web/apache.pp

@@ -0,0 +1,60 @@
+class freighthop::web::apache(
+  $ssl,
+  $ssl_cert_path,
+  $ssl_key_path,
+  $server_name,
+  $port                    = $freighthop::params::http_port,
+  $ssl_port                = $freighthop::params::https_port,
+  $upstream_port           = $freighthop::params::upstream_port,
+  $owner                   = $freighthop::params::uid,
+  $group                   = $freighthop::params::gid,
+  $web_root                = $freighthop::params::web_root,
+  $passenger               = $freighthop::params::passenger,
+  $passenger_buffer_upload = $freighthop::params::passenger_buffer_upload,
+) {
+  class { '::apache':
+    default_vhost => false,
+  }
+  apache::vhost { "${server_name} non-ssl":
+    servername    => $server_name,
+    docroot       => $web_root,
+    port          => $port,
+    docroot_owner => $owner,
+    docroot_group => $group,
+  }
+
+  if str2bool($ssl) {
+    apache::vhost { "${server_name} ssl":
+      servername => $server_name,
+      docroot    => $web_root,
+      port       => $ssl_port,
+      ssl        => true,
+      ssl_cert   => $ssl_cert_path,
+      ssl_key    => $ssl_key_path,
+    }
+  }
+
+  if str2bool($passenger) {
+    package { 'apt-transport-https':
+      ensure => installed
+    } ->
+    apt::source { 'phusion':
+      location => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
+      key      => '561F9B9CAC40B2F7',
+      pin      => 1000,
+    } ->
+    package { 'passenger':
+      ensure => 'installed'
+    } ->
+    apache::mod { 'passenger':
+    } ->
+    file { '/etc/apache2/conf.d/passenger.conf':
+      ensure  => present,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      content => template('freighthop/apache/passenger.conf.erb'),
+      notify  => Service['httpd'],
+    }
+  }
+}

data/local_modules/freighthop/manifests/web/nginx.pp

@@ -0,0 +1,22 @@
+class freighthop::web::nginx(
+  $ssl,
+  $ssl_cert_path,
+  $ssl_key_path,
+  $server_name,
+  $port          = $freighthop::params::http_port,
+  $ssl_port      = $freighthop::params::https_port,
+  $upstream_port = $freighthop::params::upstream_port,
+  $web_root      = $freighthop::params::web_root,
+) {
+  class {'::nginx':
+    confd_purge => true
+  }
+
+  file { '/etc/nginx/conf.d/vagrant-rails.conf':
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => template('freighthop/nginx/vagrant-rails.conf.erb'),
+    notify  => Service['nginx'],
+  }
+}

data/local_modules/freighthop/manifests/web/ssl.pp

@@ -0,0 +1,13 @@
+class freighthop::web::ssl(
+  $server_name,
+  $ssl_cert_path,
+  $ssl_key_path,
+){
+  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Freighthop/CN=${server_name}"
+
+  exec { 'generate-self-signed-ssl-cert':
+    command => "openssl req -x509 -nodes -days 3650 -subj '${cert_subject}' -newkey rsa:1024 -keyout ${ssl_key_path} -out ${ssl_cert_path}",
+    path    => ['/usr/bin'],
+    creates => $ssl_cert_path,
+  }
+}

data/local_modules/freighthop/manifests/web.pp

@@ -1,28 +1,32 @@
 class freighthop::web(
-  $upstream_web_port,
-  $server_name,
-  $web_root,
-  $ssl_cert_path,
-  $ssl_key_path,
+  $servers       = $freighthop::params::web_servers,
+  $server_name   = $freighthop::params::server_name,
+  $ssl           = $freighthop::params::ssl,
+  $ssl_cert_path = $freighthop::params::ssl_cert_path,
+  $ssl_key_path  = $freighthop::params::ssl_key_path,
 ) {
-  $cert_subject = "/C=US/ST=IL/L=Chicago/O=Freighthop/CN=${server_name}"
-
-  class {'::nginx':
-    confd_purge => true
+  if $ssl {
+    class { 'freighthop::web::ssl':
+      ssl_cert_path => $ssl_cert_path,
+      ssl_key_path  => $ssl_key_path,
+      server_name   => $server_name,
+    }
   }
 
-  exec { 'generate-self-signed-ssl-cert':
-    command => "openssl req -x509 -nodes -days 3650 -subj '${cert_subject}' -newkey rsa:1024 -keyout ${ssl_key_path} -out ${ssl_cert_path}",
-    path    => ['/usr/bin'],
-    creates => $ssl_cert_path,
+  if member($servers, 'nginx') {
+    class { 'freighthop::web::nginx':
+      ssl           => $ssl,
+      ssl_cert_path => $ssl_cert_path,
+      ssl_key_path  => $ssl_key_path,
+      server_name   => $server_name,
+    }
   }
-
-  file { '/etc/nginx/conf.d/vagrant-rails.conf':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => template('freighthop/nginx/vagrant-rails.conf.erb'),
-    notify  => Service['nginx'],
-    require => Exec['generate-self-signed-ssl-cert'],
+  if member($servers, 'apache') {
+    class { 'freighthop::web::apache':
+      ssl           => $ssl,
+      ssl_cert_path => $ssl_cert_path,
+      ssl_key_path  => $ssl_key_path,
+      server_name   => $server_name,
+    }
   }
 }

data/local_modules/freighthop/templates/apache/passenger.conf.erb

@@ -0,0 +1,18 @@
+# Managed by Puppet; changes will be overwritten.
+<IfModule mod_passenger.c>
+  # PassengerRoot comes straight from the phusion libapache2-mod-passenger
+  # package's stock config
+  PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+
+  # Points to the ruby interpreter that will be used to run applications
+  PassengerDefaultRuby /home/vagrant/.rbenv/shims/ruby
+
+  # Send uploads directly to Rack application without buffering them first.
+  # Allows application to deal in streams for large uploads.
+  # Requires Passenger 4.0.26 or higher; defaults to Off
+<% if @passenger_buffer_upload -%>
+  PassengerBufferUpload On
+<% else -%>
+  PassengerBufferUpload Off
+<% end -%>
+</IfModule>