Merge branch 'master' of github.com:internetee/registry

README.md

@@ -36,7 +36,13 @@ Manual demo install and database setup:
     mv config/secrets-example.yml config/secrets.yml # and generate your own key with 'rake secret'
     rake assets:precompile
 
-Production install (requires database is already setuped)
+Create database manually, example: 
+    
+    create database registry owner registry encoding 'UTF-8' LC_COLLATE 'et_EE.utf8' LC_CTYPE 'et_EE.utf8' template template0;
+    rake db:schema:load
+    rake db:seeds
+
+Production install (database schema should be loaded and seeds should be present)
 
     # at your local machine
     git clone https://github.com/internetee/EPP-web-client.git eppweb
@@ -54,12 +60,6 @@ Production install (requires database is already setuped)
     # at your local machine
     mina pr deploy # this is command you use in every application code update
 
-Create database manually, example: 
-    
-    create database registry owner registry encoding 'UTF-8' LC_COLLATE 'et_EE.utf8' LC_CTYPE 'et_EE.utf8' template template0;
-    rake db:schema:load
-    rake db:seeds
-
 ### Apache with patched mod_epp (Debian 7/Ubuntu 14.04 LTS)
 
     sudo apt-get install apache2

config/deploy.rb

@@ -16,6 +16,13 @@ set :deploy_to, '/home/app/registry'
 set :repository, 'https://github.com/internetee/registry'
 set :branch, 'master'
 
+# staging
+task :st do
+  set :domain, 'registry-st'
+  set :deploy_to, '/home/registry/registry'
+  set :branch, 'master' # temp
+end
+
 # production
 task :pr do
   set :domain, 'registry'