Skip to content

Commit

Permalink
Fixed marklogic-community#799: allow non-local to be wiped without co…
Browse files Browse the repository at this point in the history
…nfirmation
  • Loading branch information
grtjn committed Jun 9, 2017
1 parent 1326241 commit c065066
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions deploy/default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ rewrite-resolves-globally=
# Environments recognized by Roxy
environments=local,dev,prod

# Environments that can be wiped without confirmation
wipe_environments=local

#
# The Major version of ML server across your environments (6, 7, or 8). You can override
# this value in build.properties if all of your servers are the same version
Expand Down
3 changes: 2 additions & 1 deletion deploy/lib/server_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,8 @@ def wipe
@ml_password = @properties['ml.password']
end

if @environment != "local"
wipe_environments = (@properties['ml.wipe-environments'] || 'local').split(',')
if ! wipe_environments.index(@environment)
expected_response = %Q{I WANT TO WIPE #{@environment.upcase}}
print %Q{
*******************************************************************************
Expand Down

0 comments on commit c065066

Please sign in to comment.