freighthop 0.3.0 → 0.3.1

data/data/common.json

@@ -2,5 +2,6 @@
   "classes": ["freighthop"],
   "freighthop::ppas": [],
   "freighthop::packages": ["build-essential", "git"],
-  "freighthop::languages": []
+  "freighthop::languages": [],
+  "freighthop::web::apache::passenger_app_env": "development"
 }

data/lib/freighthop/version.rb

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

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

@@ -1,7 +1,14 @@
 define freighthop::database::mysql::grant(
-  $user
+  $user = $title,
 ) {
-  mysql_grant { "freighthop_mysql_grant_for_${user}":
+  mysql_grant { "freighthop_mysql_grant_for_${user}_localhost":
+    ensure     => 'present',
+    options    => ['GRANT'],
+    privileges => ['ALL'],
+    table      => '*.*',
+    user       => "${user}@localhost",
+  }
+  mysql_grant { "freighthop_mysql_grant_for_${user}_external":
     ensure     => 'present',
     options    => ['GRANT'],
     privileges => ['ALL'],

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

@@ -3,6 +3,7 @@ class freighthop::web::apache(
   $ssl_cert_path,
   $ssl_key_path,
   $server_name,
+  $passenger_app_env,
   $port                    = $freighthop::params::http_port,
   $ssl_port                = $freighthop::params::https_port,
   $upstream_port           = $freighthop::params::upstream_port,

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

@@ -7,6 +7,12 @@
   # Points to the ruby interpreter that will be used to run applications
   PassengerDefaultRuby /home/vagrant/.rbenv/shims/ruby
 
+  # Passenger will run as vagrant, where rbenv is installed
+  PassengerDefaultUser vagrant
+
+  # Set the rack/rails environment
+  PassengerAppEnv <%= @passenger_app_env %>
+
   # 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

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

@@ -1,7 +1,14 @@
 define freighthop::database::mysql::grant(
-  $user
+  $user = $title,
 ) {
-  mysql_grant { "freighthop_mysql_grant_for_${user}":
+  mysql_grant { "freighthop_mysql_grant_for_${user}_localhost":
+    ensure     => 'present',
+    options    => ['GRANT'],
+    privileges => ['ALL'],
+    table      => '*.*',
+    user       => "${user}@localhost",
+  }
+  mysql_grant { "freighthop_mysql_grant_for_${user}_external":
     ensure     => 'present',
     options    => ['GRANT'],
     privileges => ['ALL'],

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

@@ -3,6 +3,7 @@ class freighthop::web::apache(
   $ssl_cert_path,
   $ssl_key_path,
   $server_name,
+  $passenger_app_env,
   $port                    = $freighthop::params::http_port,
   $ssl_port                = $freighthop::params::https_port,
   $upstream_port           = $freighthop::params::upstream_port,

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

@@ -7,6 +7,12 @@
   # Points to the ruby interpreter that will be used to run applications
   PassengerDefaultRuby /home/vagrant/.rbenv/shims/ruby
 
+  # Passenger will run as vagrant, where rbenv is installed
+  PassengerDefaultUser vagrant
+
+  # Set the rack/rails environment
+  PassengerAppEnv <%= @passenger_app_env %>
+
   # 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freighthop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler