diff --git a/README.md b/README.md
index 07e54e1a68e7410d27c8ecead75962618ff3c5dd..d2233e8449ecf99bbfea2eb7be704b7928e2e3d5 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,42 @@
# Portal MEC
-[](https://ci.gitlab.c3sl.ufpr.br/projects/19?ref=master)
-
## Requirements
* ruby >=2.2
* rvm
- * Dspace server, with solr access allowed
- * Postgres
- * OrientDB
+ * Dspace server
+ * Postgres >=9.4
+ * Elasticsearch
+ * Redis
## Setup
-To setup the rails app, will be needed run active record migrations,
-orient db migrations and populate active record database:
+First of all, you need configure the dspace, elasticsearch and redis servers. An user for postgres database will be needed to.
+After this setup, open the config files and update some vars:
+ * config/database.yml: change your postgres credentials for development and test environment.
+ * config/dspace.yml: change your dspace host and credentials for development and test environment.
+ * config/sidekiq.yml: change your redis hosts and ports.
+ * config/initializers/gitlab.rb: change your gitlab host for bug reports and set env var with private token. ( $ export GITLAB_PORTALMEC_PRIVATE_TOKEN=131237128937128937 )
+
+### Development environment
+If all development and test vars are set, run:
+``` ./bin/setup ```
+This command will install the rubygems, create/reset your database schema, seed some default data and import all dspace data.
+
+After this, your application is ready to use and you can access it with:
+``` bundle exec rails s ```
+
+### Test environment
+For tests, TestUnit is used, and to run it:
+``` bundle exec rake test ```
+
+### Production environment
+As you set development and test environment vars, now production vars will be needed to be set.
+For that, open the file config/env_vars.sh and set them. After, run:
+``` ./config/env_vars.sh ```
+
+ * Redis vars need to be set on config/sidekiq.yml
+ * In config/initializers/devise.rb, change the emails addresses. (Ex.: config.mailer_sender = 'suporte@c3sl.ufpr.br')
+Now, you can run and your application is ready to use:
``` ./bin/setup ```
-## Definitions
-Some definitions and vocabulary of project domain model.
-
-## Deploy
-Before deploy to production server, some env vars need be set:
-
- ### Application Secrets
-
- The command 'rake secret' can be used for generate random string
-
- * SECRET_TOKEN
- * SECRET_KEY_BASE
-
- ### Postgres/Active Record credentials
- * PORTALMEC_DB_NAME
- * PORTALMEC_DB_USERNAME
- * PORTALMEC_DB_PASSWORD
-
- ### OrientDB credentials
- * PORTALMEC_ORIENTDB_HOST
- * PORTALMEC_ORIENTDB_DATABASE
- * PORTALMEC_ORIENTDB_USERNAME
- * PORTALMEC_ORIENTDB_PASSWD
- * PORTALMEC_ORIENTDB_PORT
-
- ### Dspace credentials
- * PORTALMEC_DSPACE_SOLR
- * PORTALMEC_DSPACE_REST
- * PORTALMEC_DSPACE_PORT
- * PORTALMEC_DSPACE_HOST
-
- ### Rails environment
- * RAILS_SERVE_STATIC_FILES - default is FALSE
- * RAILS_ENV: production, test or development
-
- Run:
-```
-$ mina setup
-$ mina deploy
-```
\ No newline at end of file
+After the setup, link your webserver to the app. Some OS services are in root of the project and can be used.
\ No newline at end of file
diff --git a/bin/setup b/bin/setup
index fefb1911edb475c2bc015237234676b661a32208..c54141a04c2dfe0f92be58fc8ab9d9def2e23995 100755
--- a/bin/setup
+++ b/bin/setup
@@ -10,16 +10,16 @@ Dir.chdir APP_ROOT do
puts "== Installing dependencies =="
system "gem install bundler --conservative"
- system "bundle check || bundle install"
+ system "bundle check || bundle install --jobs $(nproc)"
- # puts "\n== Copying sample files =="
- # unless File.exist?("config/database.yml")
- # system "cp config/database.yml.sample config/database.yml"
- # end
+ puts "\n== Checks database config file =="
+ unless File.exist?("config/database.yml")
+ puts "\n You need create config/database.yml. Please follow our README"
+ exit
+ end
- puts "\n== Preparing databases =="
- system "bin/rake db:setup"
- system "bin/rake orientdb:migrate"
+ puts "\n== Preparing databases, importing data and setup PortalMEC =="
+ system "bundle exec rake portalmec:setup"
puts "\n== Removing old logs and tempfiles =="
system "rm -f log/*"
diff --git a/config/database.yml.gitlab b/config/database.yml.gitlab
deleted file mode 100644
index fb08e1e402d9f56a785d86d5c18cee25eb90c3cb..0000000000000000000000000000000000000000
--- a/config/database.yml.gitlab
+++ /dev/null
@@ -1,24 +0,0 @@
-default: &defaults
- adapter: postgresql
- encoding: unicode
- pool: 5
-
-development: &development
- <<: *defaults
- database: portalmec_dev
- username:
- password:
-
-test:
- <<: *defaults
- host: localhost
- database: <%= ENV['POSTGRES_DB'] %>
- username: <%= ENV['POSTGRES_USER'] %>
- password: <%= ENV['POSTGRES_PASSWORD'] %>
-
-production:
- <<: *defaults
- host: <%= ENV['PORTALMEC_DB_HOST'] %>
- database: <%= ENV['PORTALMEC_DB_NAME'] %>
- username: <%= ENV['PORTALMEC_DB_USERNAME'] %>
- password: <%= ENV['PORTALMEC_DB_PASSWORD'] %>