Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
classicalliu committed Aug 13, 2018
2 parents 8acda5a + a05d0ed commit 102950e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .ruby-gemset.sample
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ReBirth
re-birth
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# ReBirth

[![Build Status](https://travis-ci.org/cryptape/ReBirth.svg?branch=master)](https://travis-ci.org/cryptape/ReBirth)
[![codecov](https://codecov.io/gh/cryptape/ReBirth/branch/master/graph/badge.svg)](https://codecov.io/gh/cryptape/ReBirth)
[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](https://www.rubydoc.info/github/cryptape/ReBirth/master)
[![Build Status](https://travis-ci.org/cryptape/re-birth.svg?branch=master)](https://travis-ci.org/cryptape/re-birth)
[![codecov](https://codecov.io/gh/cryptape/re-birth/branch/master/graph/badge.svg)](https://codecov.io/gh/cryptape/re-birth)
[![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](https://www.rubydoc.info/github/cryptape/re-birth/master)

A blockchain explorer cache for [Appchain](https://github.com/cryptape/cita).
A blockchain explorer cache server for [Nervos Appchain](https://docs.nervos.org/nervos-appchain-docs/#/).

## Packages

- postgresql 9.4 and above
- [postgresql](https://www.postgresql.org/) 9.4 and above
- install secp256k1 (see [secp256k1](https://github.com/bitcoin-core/secp256k1.git) for more info)

```shell
$ cd ReBirth/tmp && git clone https://github.com/bitcoin-core/secp256k1.git && cd secp256k1 && ./autogen.sh && ./configure --enable-module-recovery --enable-experimental --enable-module-ecdh && make && sudo make install && cd ../..
$ cd re-birth/tmp && git clone https://github.com/bitcoin-core/secp256k1.git && cd secp256k1 && ./autogen.sh && ./configure --enable-module-recovery --enable-experimental --enable-module-ecdh && make && sudo make install && cd ../..
```

## Initial Project
Expand All @@ -23,7 +23,7 @@ $ touch .env.local (overwrite `.env` config if you need in `.env.local`, such as
$ rails db:setup (or rails db:create db:migrate db:seed)
```
## Running test
## Running Test
```shell
$ touch .env.test.local (test env will not read `.env.local` file, overwrite in `.env.test.lcoal`)
Expand Down Expand Up @@ -59,9 +59,9 @@ $ bundle exec yard doc
$ bundle exec yard server
```
## Api Doc
## API Doc
### JSON-RPC interface
### JSON-RPC Interface
JSON-RPC interface, same format with [CITA JSON-RPC](https://docs.nervos.org/cita/#/rpc_guide/rpc).
Expand Down
6 changes: 3 additions & 3 deletions config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# repository - Git repo to clone from. (needed by mina/git)
# branch - Branch name to deploy. (needed by mina/git)

set :application_name, 'ReBirth'
set :application_name, 're-birth'
set :domain, '47.97.171.140'
set :deploy_to, '/home/deploy/ReBirth'
set :repository, 'https://github.com/cryptape/ReBirth.git'
set :deploy_to, '/home/deploy/re-birth'
set :repository, 'https://github.com/cryptape/re-birth.git'
set :branch, 'develop'
set :rails_env, 'production'
set :user, 'deploy'
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/dev.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
set :domain, '47.97.171.140'
set :deploy_to, '/home/deploy/ReBirth'
set :deploy_to, '/home/deploy/re-birth'
set :branch, 'develop'
set :user, 'root'
set :rvm_use_path, '/usr/share/rvm/scripts/rvm'
8 changes: 4 additions & 4 deletions config/nginx.conf.sample
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
upstream re-birth {
server unix:///home/deploy/ReBirth/shared/tmp/sockets/puma.sock;
server unix:///home/deploy/re-birth/shared/tmp/sockets/puma.sock;
}

server {
listen 80 default_server deferred;
server_name example.com;

root /home/deploy/ReBirth/current/public;
access_log /home/deploy/ReBirth/current/log/nginx.access.log;
error_log /home/deploy/ReBirth/current/log/nginx.error.log info;
root /home/deploy/re-birth/current/public;
access_log /home/deploy/re-birth/current/log/nginx.access.log;
error_log /home/deploy/re-birth/current/log/nginx.error.log info;

location ^~ /assets/ {
gzip_static on;
Expand Down
2 changes: 1 addition & 1 deletion config/puma.rb.sample
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ environment 'production'
workers 2
threads 1, 6

app_name = "ReBirth"
app_name = "re-birth"
application_path = "/home/deploy/#{app_name}"
directory "#{application_path}/current"

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ReBirth",
"name": "re-birth",
"private": true,
"dependencies": {}
}

0 comments on commit 102950e

Please sign in to comment.