Capfile config.ru config/database.yml.ec2 config/deploy.rb.example @@ -6,11 +6,11 @@ uuid.state database.yml schema.rb panda_init.rb -videos/* panda_*.god panda_nginx.conf videos/* config/mailer.rb +config/deploy.rb config/panda_init_*.rb panda_all_staging_nginx.conf public/images/tmp/*jpg .gitignore @@ -24,6 +24,6 @@ class Profile rescue # Datamapper should raise a consistent error if the domain/table does not # exist. It doesn't. So rescue everything. - Merb.logger.info "PANDA WARNING: Profile domain/table does not exist. Please check that you have created all the required domains/tables (see the getting started guide)." + Merb.logger.info "PANDA WARNING: Profile SimpleDB domain or MySQL table does not exist. Please check that you have created all the required domains/tables (see the getting started guide for more details)." end end app/models/profile.rb @@ -6,7 +6,6 @@ :username: root :password: :host: localhost - :socket: :encoding: utf8 :test: @@ -21,7 +20,6 @@ :password: :host: localhost :encoding: utf8 - :socket: /var/run/mysqld/mysqld.sock :encoder: <<: *prod config/database.yml.example @@ -15,7 +15,7 @@ dependency "do_mysql", "0.9.11" # dependency 'RubyInline', '3.8.1' dependency 'uuid', '2.0.1' dependency 'activesupport', '2.1.1' -dependency 'rvideo', '0.9.3' +require 'rvideo' # dependency 'aws-s3', '0.5.1' do # require 'aws/s3' # end config/dependencies.rb e320c80367533a9d8d5e712a82b38fbfe9dce45e Damien Tanner damien@new-bamboo.co.uk http://github.com/twinge/panda/commit/6422e5f92fe6b530c7020a9647be23f5eaf5ac8e 6422e5f92fe6b530c7020a9647be23f5eaf5ac8e 2009-03-09T11:39:38-07:00 2009-03-09T11:39:38-07:00 deploy to new EC2 AMI with Cap 3f33c25349c7ca5def3b3ee0be2284db08ef3392 Damien Tanner damien@new-bamboo.co.uk