aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-06 09:19:06 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-10-06 09:19:06 +0200
commit16dabc326311f084d671be188c7941bbb3c341c9 (patch)
tree3210a7688ea2bfa1bff5fd0422b52adf570edcdc /config
parentfdef5f460524215d806e244e5546865f4b8e01df (diff)
parent8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff)
downloadwallabag-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.rb4
-rw-r--r--config/deploy/staging.rb2
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'
4set :application, 'wallabag' 4set :application, 'wallabag'
5set :repo_url, 'git@github.com:wallabag/wallabag.git' 5set :repo_url, 'git@github.com:wallabag/wallabag.git'
6 6
7set :ssh_user, 'ssh_user' 7set :ssh_user, 'framasoft_bag'
8server 'server_ip', user: fetch(:ssh_user), roles: %w{web app db} 8server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
9 9
10set :scm, :git 10set :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 @@
1set :branch, 'v2' 1set :branch, 'v2'
2set :deploy_to, '/var/www/' 2set :deploy_to, '/var/www/v2.wallabag.org/web/'