General fixes

Gemfile

@@ -3,6 +3,10 @@ source :rubygems
 gem 'sinatra'
 gem 'oldskool'
 gem 'oldskool-puppet'
+gem 'oldskool-password'
+
+gem 'puppet'
+gem 'facter'
 
 group :development do
   gem 'capistrano'

Gemfile.lock

@@ -28,9 +28,12 @@ GEM
       bundler
       httparty
       sinatra
+    oldskool-password (0.0.2)
+      passmakr
     oldskool-puppet (0.0.3)
       puppet
       redcarpet
+    passmakr (1.1.0)
     puppet (2.7.14)
       facter (>= 1.5.1)
     rack (1.4.1)
@@ -52,8 +55,11 @@ PLATFORMS
 DEPENDENCIES
   capistrano
   capistrano_colors
+  facter
   oldskool
+  oldskool-password
   oldskool-puppet
+  puppet
   railsless-deploy
   rvm-capistrano
   sinatra

config/deploy.rb

@@ -1,26 +1,28 @@
+# Disable some Rails-specific tasks
 require 'railsless-deploy'
 
+# General Settings
 set :application, 'OldSkool'
 set :deploy_to,   '/usr/local/share/deploy/oldskool'
 set :user,        'deploy'
-set :sudo,        false
 set :use_sudo,    false
 
+# Servers
+role :app, 'mail01.sudobangbang.org'
+
 set :scm,        :git
 set :repository, 'git://github.com/torrancew/sbb-search.git'
 
 set :rvm_type,                :user
 set :rvm_install_type,        :stable
 set :rvm_install_shell,       :bash
-set :rvm_install_with_sudo,   false
-set :rvm_ruby_string,         '1.9.3@oldskool'
+set :rvm_ruby_string,         '1.8.7'
 set :rvm_install_ruby_params, ''
 
+# Integrate with RVM, Bundler
 require 'rvm/capistrano'
 require 'bundler/capistrano'
 
-role :app, 'mail01.sudobangbang.org'
-
 before 'deploy:setup' do
   rvm.install_rvm
   rvm.install_ruby

config/oldskool.yaml

@@ -10,6 +10,6 @@
   :keywords:
   - map
   - gmap
-- :type: :puppet
+- :type: :password
   :keywords:
-  - puppet
+  - pass