Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

make some changes to get this to work.

  • Loading branch information...
commit 3855bbc83e1f7c42176d60dd8969cfeff835ff73 1 parent f8ae9c1
@maxwell maxwell authored
View
3  Gemfile
@@ -10,6 +10,9 @@ gem 'sqlite3'
gem 'resque'
gem 'fog', :require => false
+
+gem 'foreman'
+
# Gems used only for assets and not required
# in production environments by default.
View
3  Gemfile.lock
@@ -86,6 +86,8 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
+ foreman (0.56.0)
+ thor (>= 0.13.6)
formatador (0.2.1)
gherkin (2.10.0)
json (>= 1.4.6)
@@ -227,6 +229,7 @@ DEPENDENCIES
database_cleaner
figaro
fog
+ foreman
heroku
heroku-api
jquery-rails
View
2  Procfile
@@ -0,0 +1,2 @@
+web: bundle exec rails server -p $PORT
+worker: env VVERBOSE=1 QUEUE=* bundle exec rake environment resque:work
View
268 README.rdoc
@@ -1,261 +1,51 @@
-== Welcome to Rails
+Diaspora Provisioner.
-Rails is a web-application framework that includes everything needed to create
-database-backed web applications according to the Model-View-Control pattern.
-This pattern splits the view (also called the presentation) into "dumb"
-templates that are primarily responsible for inserting pre-built data in between
-HTML tags. The model contains the "smart" domain objects (such as Account,
-Product, Person, Post) that holds all the business logic and knows how to
-persist themselves to a database. The controller handles the incoming requests
-(such as Save New Account, Update Product, Show Post) by manipulating the model
-and directing data to the view.
+This is an app that deploys diaspora instances to heroku, in a single process.
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in
-link:files/vendor/rails/activerecord/README.html.
+It is a little derpy right now, but with a little love, this/is/could be a one click deploy of D* to the heroku cloud.
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails. You can read more about Action Pack in
-link:files/vendor/rails/actionpack/README.html.
-== Getting Started
+In order to run this little app, and make it complete magic, one needs the following:
-1. At the command prompt, create a new Rails application:
- <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+an amazon s3 bucket.
+a heroku account.
-2. Change directory to <tt>myapp</tt> and start the web server:
- <tt>cd myapp; rails server</tt> (run with --help for options)
+redis
-3. Go to http://localhost:3000/ and you'll see:
- "Welcome aboard: You're riding Ruby on Rails!"
+this repo
-4. Follow the guidelines to start developing your application. You can find
-the following resources handy:
-* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
-* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+You can run this web app locally, if you just want an easy way to set up d* or you could run it as a simple service for people so they can deploy their own d* instances
-== Debugging Rails
+** Getting Set up **
-Sometimes your application goes wrong. Fortunately there are a lot of tools that
-will help you debug it and get it back on the rails.
+first, make a config/application.yml with the following keys
-First area to check is the application log files. Have "tail -f" commands
-running on the server.log and development.log. Rails will automatically display
-debugging and runtime information to these files. Debugging info will also be
-shown in the browser on requests from 127.0.0.1.
+~~yml
+ HEROKU_API_KEY: 'your heroku api key'
+ AWS_ACCESS_KEY_ID: '<your aws key>'
+ AWS_SECRET_ACCESS_KEY: '<your aws secret>'
+ FOG_DIRECTORY: diasporaprovisioner # or whatever you want
+ FOG_PROVIDER: 'AWS'
+~~
-You can also log your own messages directly into the log file from your code
-using the Ruby logger class from inside your controllers. Example:
- class WeblogController < ActionController::Base
- def destroy
- @weblog = Weblog.find(params[:id])
- @weblog.destroy
- logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
- end
- end
+** want to help? **
-The result will be a message in your log file along the lines of:
+try running this on your own computer, and follow my directions. if something doesnt work, fork the project and send me a pull request.
- Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+once we get this running, it would be great to write a more generic guide to getting d* running on heorku.
-More information on how to use the logger is at http://www.ruby-doc.org/core/
-Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
-several books available online as well:
-* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
-* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
-
-These two books will bring you up to speed on the Ruby language and also on
-programming in general.
-
-
-== Debugger
-
-Debugger support is available through the debugger command when you start your
-Mongrel or WEBrick server with --debugger. This means that you can break out of
-execution at any point in the code, investigate and change the model, and then,
-resume execution! You need to install ruby-debug to run the server in debugging
-mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
-
- class WeblogController < ActionController::Base
- def index
- @posts = Post.all
- debugger
- end
- end
-
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the server window. Here you can do things like:
-
- >> @posts.inspect
- => "[#<Post:0x14a6be8
- @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
- #<Post:0x14a6620
- @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
- >> @posts.first.title = "hello from a debugger"
- => "hello from a debugger"
-
-...and even better, you can examine how your runtime objects actually work:
-
- >> f = @posts.first
- => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
- >> f.
- Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you can enter "cont".
-
-
-== Console
-
-The console is a Ruby shell, which allows you to interact with your
-application's domain model. Here you'll have all parts of the application
-configured, just like it is when the application is running. You can inspect
-domain models, change values, and save to the database. Starting the script
-without arguments will launch it in the development environment.
-
-To start the console, run <tt>rails console</tt> from the application
-directory.
-
-Options:
-
-* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
- made to the database.
-* Passing an environment name as an argument will load the corresponding
- environment. Example: <tt>rails console production</tt>.
-
-To reload your controllers and models after launching the console run
-<tt>reload!</tt>
-
-More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
-
-
-== dbconsole
-
-You can go to the command line of your database directly through <tt>rails
-dbconsole</tt>. You would be connected to the database with the credentials
-defined in database.yml. Starting the script without arguments will connect you
-to the development database. Passing an argument will connect you to a different
-database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
-PostgreSQL and SQLite 3.
-
-== Description of Contents
-
-The default directory structure of a generated Ruby on Rails application:
-
- |-- app
- | |-- assets
- | |-- images
- | |-- javascripts
- | `-- stylesheets
- | |-- controllers
- | |-- helpers
- | |-- mailers
- | |-- models
- | `-- views
- | `-- layouts
- |-- config
- | |-- environments
- | |-- initializers
- | `-- locales
- |-- db
- |-- doc
- |-- lib
- | `-- tasks
- |-- log
- |-- public
- |-- script
- |-- test
- | |-- fixtures
- | |-- functional
- | |-- integration
- | |-- performance
- | `-- unit
- |-- tmp
- | |-- cache
- | |-- pids
- | |-- sessions
- | `-- sockets
- `-- vendor
- |-- assets
- `-- stylesheets
- `-- plugins
-
-app
- Holds all the code that's specific to this particular application.
-
-app/assets
- Contains subdirectories for images, stylesheets, and JavaScript files.
-
-app/controllers
- Holds controllers that should be named like weblogs_controller.rb for
- automated URL mapping. All controllers should descend from
- ApplicationController which itself descends from ActionController::Base.
-
-app/models
- Holds models that should be named like post.rb. Models descend from
- ActiveRecord::Base by default.
-
-app/views
- Holds the template files for the view that should be named like
- weblogs/index.html.erb for the WeblogsController#index action. All views use
- eRuby syntax by default.
-
-app/views/layouts
- Holds the template files for layouts to be used with views. This models the
- common header/footer method of wrapping views. In your views, define a layout
- using the <tt>layout :default</tt> and create a file named default.html.erb.
- Inside default.html.erb, call <% yield %> to render the view using this
- layout.
-
-app/helpers
- Holds view helpers that should be named like weblogs_helper.rb. These are
- generated for you automatically when using generators for controllers.
- Helpers can be used to wrap functionality for your views into methods.
-
-config
- Configuration files for the Rails environment, the routing map, the database,
- and other dependencies.
-
-db
- Contains the database schema in schema.rb. db/migrate contains all the
- sequence of Migrations for your schema.
-
-doc
- This directory is where your application documentation will be stored when
- generated using <tt>rake doc:app</tt>
-
-lib
- Application specific libraries. Basically, any kind of custom code that
- doesn't belong under controllers, models, or helpers. This directory is in
- the load path.
-
-public
- The directory available for the web server. Also contains the dispatchers and the
- default HTML files. This should be set as the DOCUMENT_ROOT of your web
- server.
-
-script
- Helper scripts for automation and generation.
-
-test
- Unit and functional tests along with fixtures. When using the rails generate
- command, template test files will be generated for you and placed in this
- directory.
-
-vendor
- External libraries that the application depends on. Also includes the plugins
- subdirectory. If the app has frozen rails, those gems also go here, under
- vendor/rails/. This directory is in the load path.
+**To do**
+* make this run locally and on heroku itself
+* make it more foolproof, maybe make a generator to set up the nessisary files?
+* remove a copy of d* from this repo
+* make it more configurable
+* write a more detailed tutorial
+* make d* run in single process mode by forking a worker inside the heroku process
+* allow a user to submit their own heroku api key, so the app could start up an app for you, and then be done with you.
View
7 app/models/diaspora.rb
@@ -19,18 +19,19 @@ def heroku_labs
end
def config_vars
- {
+ vars = {
'HEROKU' => 'true',
'SECRET_TOKEN' => SecureRandom.hex(40),
'AWS_ACCESS_KEY_ID' => ENV['AWS_ACCESS_KEY_ID'],
'AWS_SECRET_ACCESS_KEY' => ENV['AWS_SECRET_ACCESS_KEY'],
- 'FOG_DIRECTORY' => name || ENV['FOG_DIRECTORY'],
+ 'FOG_DIRECTORY' => name,
'FOG_PROVIDER' => ENV['FOG_PROVIDER'],
'ASSET_HOST' => "https://#{name}.s3.amazonaws.com",
'NEW_HOTNESS' => 'yesplze',
'ERROR_PAGE_URL' => 'https://s3.amazonaws.com/joindiaspora/sorry.html',
'MAINTENANCE_PAGE_URL' => 'https://s3.amazonaws.com/joindiaspora/5xx.html',
- 'application_yml' => 'changeme'
+ 'application_yml' => ENV['DIASPORA_APPLICATION_YML']
}
+ vars
end
end
View
2  app/models/heroku_provisioner.rb
@@ -63,7 +63,7 @@ def initialize_app
end
def add_config_vars
- Rails.logger.info 'adding config put_config_vars'
+ Rails.logger.info 'adding config vars'
client.put_config_vars(@app.name, @app.config_vars)
end
View
BIN  vendor/.DS_Store
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.