diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
|---|---|---|
| committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
| commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
| tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /config | |
| parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
| parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
| download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip | |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy.rb | 4 | ||||
| -rw-r--r-- | config/deploy/staging.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index be18ce5a..c2562965 100644 --- a/config/deploy.rb +++ b/config/deploy.rb | |||
| @@ -4,8 +4,8 @@ lock '3.4.0' | |||
| 4 | set :application, 'wallabag' | 4 | set :application, 'wallabag' |
| 5 | set :repo_url, 'git@github.com:wallabag/wallabag.git' | 5 | set :repo_url, 'git@github.com:wallabag/wallabag.git' |
| 6 | 6 | ||
| 7 | set :ssh_user, 'ssh_user' | 7 | set :ssh_user, 'framasoft_bag' |
| 8 | server 'server_ip', user: fetch(:ssh_user), roles: %w{web app db} | 8 | server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} |
| 9 | 9 | ||
| 10 | set :scm, :git | 10 | set :scm, :git |
| 11 | 11 | ||
diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb index d67d7247..ccd05b4d 100644 --- a/config/deploy/staging.rb +++ b/config/deploy/staging.rb | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | set :branch, 'v2' | 1 | set :branch, 'v2' |
| 2 | set :deploy_to, '/var/www/' | 2 | set :deploy_to, '/var/www/v2.wallabag.org/web/' |