freighthop 0.0.1 → 0.0.2

data/README.md

@@ -29,34 +29,15 @@ This is a little involved at the moment (cuz alpha). Should simplify as the proj
 ### Get the prerequisites
 
 * Vagrant 1.3.1
-* VMWare Fusion (for now; will support VirtualBox soon)
-* Vagrant Plugins (install with `vagrant plugin install $pluginname`):
-  * landrush (for DNS)
-    * note you'll need to run `vagrant landrush install` to finish this installation procedure
-  * vagrant-cachier (for apt caching; will eventually be optional)
-  * vagrant-vmware-fusion (for now)
+* And for DNS magic:
+  * `vagrant plugin install landrush`
+  * `vagrant landrush install`
 
 
-### Clone the project
+### Install the gem
 
 ```
-git clone https://github.com/phinze/freighthop
-```
-
-### Gems and puppet modules
-
-```
-bundle install
-librarian-puppet install
-```
-
-### Get the executable on your $PATH
-
-This is a hacky symlink for now; eventually we'll wrap the project up in a distributable package that will do this for you.
-
-```
-cd freighthop
-ln -s bin/fh /usr/local/bin/fh
+gem install freighthop
 ```
 
 ### Create config

data/bin/fh

@@ -31,12 +31,16 @@ end
 subcommand, *rest = ARGV
 case subcommand
 when 'run' then
-  exec vagrant_ssh(rest.join(' '))
+  `vagrant ssh-config > /tmp/freighthop.ssh-config`
+  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -c "#{rest.join(' ')}"')
 when 'console' then
   `vagrant ssh-config > /tmp/freighthop.ssh-config`
-  exec "ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'sudo /bin/bash -l -c 'cd #{PROJECT_DIR}; #{console_command} #{rest.join(' ')}'"
+  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'sudo /bin/bash -l -c "cd #{PROJECT_DIR}; #{console_command} #{rest.join(' ')}"')
 when 'rake' then
   exec vagrant_ssh("bundle exec rake #{rest.join(' ')}")
+when 'ssh' then
+  `vagrant ssh-config > /tmp/freighthop.ssh-config`
+  exec %Q(ssh -t -F /tmp/freighthop.ssh-config #{PROJECT_NAME} 'cd #{PROJECT_DIR}; sudo /bin/bash -l -i')
 else
   exec "/usr/bin/vagrant #{ARGV.join(' ')}"
 end

data/lib/freighthop/version.rb

@@ -1,3 +1,3 @@
 module Freighthop
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/local_modules/freighthop/manifests/init.pp

@@ -6,50 +6,32 @@ class freighthop(
   $app_name        = $freighthop::params::app_name,
   $app_root        = $freighthop::params::app_root,
   $web_root        = $freighthop::params::web_root,
-  $socket_dir      = $freighthop::params::socket_dir,
-  $socket_path     = $freighthop::params::socket_path,
+  $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 {
-  file { $socket_dir:
-    ensure => directory,
-    owner  => 'vagrant',
-    group  => 'vagrant',
-    mode   => '0755'
-  }
+  include apt
+
   class { 'freighthop::pkgs':
     packages => $packages,
-  }
+  } ->
   class { 'freighthop::rbenv':
     ruby_version => $ruby_version
-  }
+  } ->
   class { 'freighthop::nginx':
-    upstream_socket_path => $socket_path,
-    server_name          => $server_name,
-    web_root             => $web_root,
-    ssl_cert_path        => $ssl_cert_path,
-    ssl_key_path         => $ssl_key_path,
-  }
+    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::bundler':
     ruby_version => $ruby_version,
     app_root     => $app_root,
   }
-  class { 'freighthop::puma':
-    app_root    => $app_root,
-    socket_path => $socket_path,
-  }
-
-  File[$socket_dir] ->
-    Class['freighthop::pkgs'] ->
-    Class['freighthop::rbenv'] ->
-    Class['freighthop::nginx'] ->
-    Class['freighthop::postgres'] ->
-    Class['freighthop::bundler'] ->
-    Class['freighthop::puma']
-
 }

data/local_modules/freighthop/manifests/nginx.pp

@@ -1,5 +1,5 @@
 class freighthop::nginx(
-  $upstream_socket_path,
+  $upstream_web_port,
   $server_name,
   $web_root,
   $ssl_cert_path,

data/local_modules/freighthop/manifests/params.pp

@@ -3,8 +3,7 @@ class freighthop::params {
   $app_name        = $::hostname
   $app_root        = "/srv/${app_name}"
   $web_root        = "${app_root}/public"
-  $socket_dir      = "/var/run/${app_name}"
-  $socket_path     = "${socket_dir}/puma.sock"
+  $web_port        = 9292
   $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/pkgs.pp

@@ -2,6 +2,6 @@ class freighthop::pkgs(
   $packages
 ) {
   package { $packages:
-    ensure => installed
+    ensure  => installed,
   }
 }

data/local_modules/freighthop/manifests/rbenv.pp

@@ -1,7 +1,6 @@
 class freighthop::rbenv(
   $ruby_version
 ) {
-  include apt
   apt::ppa { 'ppa:gds/govuk': }
   apt::ppa { 'ppa:phinze/rbenv': }
 

data/local_modules/freighthop/templates/nginx/vagrant-rails.conf.erb

@@ -1,8 +1,5 @@
 upstream app_server {
-  # fail_timeout=0 means we always retry an upstream even if it failed
-  # to return a good HTTP response (in case the Unicorn master nukes a
-  # single worker for timing out).
-  server unix:<%= upstream_socket_path %> fail_timeout=0;
+  server localhost:<%= upstream_web_port %> fail_timeout=0;
 }
 
 server {

data/local_modules/freighthop/{files/puma/upstart/puma-manager.conf → templates/puma/upstart/puma-manager.conf.erb}

@@ -15,7 +15,9 @@
 description "Manages the set of puma processes"
 
 # This starts upon bootup and stops on shutdown
-start on runlevel [2345]
+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

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

@@ -46,6 +46,8 @@ exec /bin/bash <<'EOT'
 
   logger -t puma "Starting server: $app"
 
+  mkdir -p <%= socket_dir %>
+
   exec bundle exec puma -b unix://<%= socket_path %>
 EOT
 end script

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighthop
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,18 +118,17 @@ files:
 - lib/freighthop.rb
 - lib/freighthop/version.rb
 - local_modules/freighthop/files/bundler/freighthop.gemfile
-- local_modules/freighthop/files/puma/upstart/puma-manager.conf
 - local_modules/freighthop/manifests/bundler.pp
 - local_modules/freighthop/manifests/init.pp
 - local_modules/freighthop/manifests/nginx.pp
 - local_modules/freighthop/manifests/params.pp
 - local_modules/freighthop/manifests/pkgs.pp
 - local_modules/freighthop/manifests/postgres.pp
-- local_modules/freighthop/manifests/puma.pp
 - local_modules/freighthop/manifests/rbenv.pp
 - local_modules/freighthop/manifests/redis.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
 - manifests/site.pp
 - modules/apt/CHANGELOG
@@ -149,6 +148,7 @@ files:
 - modules/apt/manifests/ppa.pp
 - modules/apt/manifests/release.pp
 - modules/apt/manifests/source.pp
+- modules/apt/manifests/unattended_upgrades.pp
 - modules/apt/manifests/update.pp
 - modules/apt/metadata.json
 - modules/apt/Modulefile
@@ -160,6 +160,7 @@ files:
 - modules/apt/spec/classes/debian_unstable_spec.rb
 - modules/apt/spec/classes/params_spec.rb
 - modules/apt/spec/classes/release_spec.rb
+- modules/apt/spec/classes/unattended_upgrades_spec.rb
 - modules/apt/spec/defines/builddep_spec.rb
 - modules/apt/spec/defines/conf_spec.rb
 - modules/apt/spec/defines/force_spec.rb
@@ -168,6 +169,8 @@ files:
 - modules/apt/spec/defines/ppa_spec.rb
 - modules/apt/spec/defines/source_spec.rb
 - modules/apt/spec/spec_helper.rb
+- modules/apt/templates/10periodic.erb
+- modules/apt/templates/50unattended-upgrades.erb
 - modules/apt/templates/pin.pref.erb
 - modules/apt/templates/source.list.erb
 - modules/apt/tests/builddep.pp
@@ -181,6 +184,7 @@ files:
 - modules/apt/tests/ppa.pp
 - modules/apt/tests/release.pp
 - modules/apt/tests/source.pp
+- modules/apt/tests/unattended-upgrades.pp
 - modules/concat/CHANGELOG
 - modules/concat/files/concatfragments.sh
 - modules/concat/lib/facter/concat_basedir.rb
@@ -243,18 +247,17 @@ files:
 - 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/files/puma/upstart/puma-manager.conf
 - modules/freighthop/manifests/bundler.pp
 - modules/freighthop/manifests/init.pp
 - modules/freighthop/manifests/nginx.pp
 - modules/freighthop/manifests/params.pp
 - modules/freighthop/manifests/pkgs.pp
 - modules/freighthop/manifests/postgres.pp
-- modules/freighthop/manifests/puma.pp
 - modules/freighthop/manifests/rbenv.pp
 - modules/freighthop/manifests/redis.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/nginx/ChangeLog
 - modules/nginx/composer.json
@@ -636,7 +639,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1509348936166327177
+      hash: 4257660574366765380
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -645,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1509348936166327177
+      hash: 4257660574366765380
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/local_modules/freighthop/manifests/puma.pp

@@ -1,36 +0,0 @@
-class freighthop::puma(
-  $app_root,
-  $socket_path,
-) {
-  package { 'puma':
-    ensure   => 'installed',
-    provider => 'gem'
-  }
-  file { '/etc/init/puma.conf':
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    content => template('freighthop/puma/upstart/puma.conf.erb')
-  }
-  file { '/etc/puma.conf':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => "${app_root}\n"
-  }
-  file { '/etc/init/puma-manager.conf':
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    source  => 'puppet:///modules/freighthop/puma/upstart/puma-manager.conf',
-    require => [
-      File['/etc/init/puma.conf'],
-      File['/etc/puma.conf'],
-    ],
-    notify  => Service['puma-manager']
-  }
-  service { 'puma-manager':
-    ensure   => 'running',
-    provider => 'upstart'
-  }
-}