forked from ontoportal/ontologies_api
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge to master: AgroPortal release 2.8.0
- Loading branch information
1 parent
77926d5
commit d9dc5c3
Showing
19 changed files
with
1,073 additions
and
207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,13 @@ | ||
| # Simple Role Syntax | ||
| # ================== | ||
| # Supports bulk-adding hosts to roles, the primary | ||
| # server in each group is considered to be the first | ||
| # unless any hosts have the primary property set. | ||
| # Don't declare `role :all`, it's a meta role | ||
| role :app, %w{[email protected]} | ||
| role :web, %w{[email protected]} | ||
| role :db, %w{[email protected]} | ||
| set :branch, 'master' | ||
| set :server, 'ecoportal.lifewatch.eu' | ||
|
|
||
| # Extended Server Syntax | ||
| # ====================== | ||
| # This can be used to drop a more detailed server | ||
| # definition into the server list. The second argument | ||
| # something that quacks like a hash can be used to set | ||
| # extended properties on the server. | ||
| server 'example.com', user: 'deploy', roles: %w{web app}, my_property: :my_value | ||
| server fetch(:server), user: fetch(:user), roles: %w{web app} | ||
|
|
||
| # you can set custom ssh options | ||
| # it's possible to pass any option but you need to keep in mind that net/ssh understand limited list of options | ||
| # you can see them in [net/ssh documentation](http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start) | ||
| # set it globally | ||
| # set :ssh_options, { | ||
| # keys: %w(/home/rlisowski/.ssh/id_rsa), | ||
| # forward_agent: false, | ||
| # auth_methods: %w(password) | ||
| # } | ||
| # and/or per server | ||
| # server 'example.com', | ||
| # user: 'user_name', | ||
| # roles: %w{web app}, | ||
| # ssh_options: { | ||
| # user: 'user_name', # overrides user setting above | ||
| # keys: %w(/home/user_name/.ssh/id_rsa), | ||
| # forward_agent: false, | ||
| # auth_methods: %w(publickey password) | ||
| # # password: 'please use keys' | ||
| # } | ||
| # setting per server overrides global ssh_options | ||
| set :ssh_options, { | ||
| user: 'ontoportal', | ||
| forward_agent: 'true', | ||
| #keys: %w(config/deploy_id_rsa), | ||
| #auth_methods: %w(publickey), | ||
| # use ssh proxy if UI servers are on a private network | ||
| #proxy: Net::SSH::Proxy::Command.new('ssh [email protected] -W %h:%p') | ||
| } |
Oops, something went wrong.