rails_pwnerer 0.5.4 → 0.5.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.5. Stronger database passwords, better mySQL configuration.
+
 v0.5.4. Bugfix release: the manifest was busted in 0.5.3.
 
 v0.5.3. Better control of mongrels using the process table and configuration database.

data/lib/pwnage/app/cluster_config.rb

@@ -111,7 +111,8 @@ class RailsPwnage::App::ClusterConfig
     # alloc a port if somehow that slipped through the cracks
     if app_config[:port0] == 0
       manage_ports app_name, instance_name, :alloc
-      configure_mongrels app_name, instance_name      
+      configure_mongrels app_name, instance_name
+      RailsPwnage::App::NginxConfig.new app_name, instance_name
     end
     
     Dir.chdir app_config[:app_path] do

data/lib/pwnage/app/config.rb

@@ -28,7 +28,7 @@ class RailsPwnage::App::Config
     # the datbase user for the given application
     app_db[:db_user] = (app_name + '_' + instance_name)[0...16] # mySQL doesn't like long user names
     # the password of the database user for the given application
-    app_db[:db_pass] = instance_name # TODO: use random number generator here instead
+    app_db[:db_pass] = (0...16).map { |i| "0123456789abcdef"[rand(16),1]}.join
     # a DNS name for server-based filtering (multiple apps on the same box)
     app_db[:dns_name] = ''
     # the maximum request size (megabytes) to be accepted by an application

data/lib/pwnage/app/database.rb

@@ -38,6 +38,27 @@ ENDSQL
       File.delete('admin_db.sql')
     end    
   end
+  
+  def mysql_host_info()
+    # try UNIX sockets first, for best performance
+    begin
+      socket_line = `mysql_config --socket`
+      socket_line.strip!
+      return {'socket' => socket_line} unless socket_line.empty?
+    rescue
+    end
+      
+    # oh well, TCP will have to suffice
+    begin
+      port_line = `mysql_config --port`
+      port = port_line.strip.to_i
+      return {'host' => 'localhost', 'port' => port} unless port == 0    
+    rescue
+    end
+    
+    # giving up, the mysql gem will have to figure it out
+    return {}
+  end
     
   # configures rails to use the database in the production environment
   def configure_rails(app_name, instance_name)
@@ -47,6 +68,7 @@ ENDSQL
     config_file = File.join app_config[:app_path], 'config', 'database.yml'
     configuration = File.open(config_file, 'r') { |f| YAML.load f }    
     configuration['production'].merge! 'adapter' => 'mysql', 'database' => db_name, 'username' => db_user, 'password' => db_pass
+    configuration['production'].merge! mysql_host_info()
     File.open(config_file, 'w') { |f| YAML.dump(configuration, f) }
     
     # bonus: lock down the database so only the right user can access it

data/lib/pwnage/scaffolds/mysql_config.rb

@@ -5,7 +5,7 @@ class RailsPwnage::Scaffolds::MysqlConfig
 
   # runner
   def run
-    Kernel.system 'ln -s /var/run/mysqld/mysqld.sock /tmp/mysql.sock'
+    # nothing to do anymore, used to configure socket
   end
 
   # standalone runner

data/lib/pwnage/scaffolds/packages.rb

@@ -25,6 +25,9 @@ class RailsPwnage::Scaffolds::Packages
     
     # needed by sqlite-3 ruby gem in tools
     install_packages %w(libsqlite3-0 libsqlite3-dev sqlite3), :source => true
+    
+    # useful to be able to work with compressed data
+    install_packages %w(tar zip bzip2 gzip)
   end
   
   # the packages comprising ruby

data/rails_pwnerer.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Rails_pwnerer-0.5.4
+# Gem::Specification for Rails_pwnerer-0.5.5
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Victor Costan

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Victor Costan