Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
adb57d8
Update README.md
rjrudin Oct 12, 2015
5c4f7ed
#62 Deploying amps after modules database created
rjrudin Oct 14, 2015
ce8dc3f
Fix ml-init for null case, and chmod gradlew
Oct 14, 2015
f3b3411
Merge pull request #63 from grechaw/fix-ml-init
rjrudin Oct 15, 2015
e3eb9cd
#61 Can now create replicas for a given database
rjrudin Oct 16, 2015
c5afcbe
#61 Now deleting replicas based on a database name
rjrudin Oct 16, 2015
06c30e2
#61 Small tweak to make sure no work is done if the maps are empty
rjrudin Oct 16, 2015
7b11ac3
#61 Allow for database names and replica counts to be set as a comma-…
rjrudin Oct 21, 2015
7114500
Updated changelog
rjrudin Oct 26, 2015
5370450
Added convenience constructor for DeployDatabaseCommand
rjrudin Oct 26, 2015
277c836
Added SetSslFipsEnabledCommand
rjrudin Nov 27, 2015
1b4584f
Merge remote-tracking branch 'origin/master' into dev
rjrudin Nov 27, 2015
4f8558e
#67 Now supporting triggers
rjrudin Nov 27, 2015
beff0cf
Updated changelog
rjrudin Nov 27, 2015
e1c8ee9
Finish issue-68
rjrudin Nov 30, 2015
e928c0e
#68 Slight modification to avoid any chance of an infinite loop
rjrudin Nov 30, 2015
9f148a5
#68 Ack, need alerts to be after CPF
rjrudin Dec 1, 2015
d274daa
Can now delete all scheduled tasks easily
rjrudin Dec 5, 2015
bfe670f
Can now delete all flexrep configs
rjrudin Dec 5, 2015
303cb50
Can now delete all alert configs
rjrudin Dec 5, 2015
02269a7
Logging an error when unable to clear a database
rjrudin Dec 6, 2015
c123539
Logging user and path on all requests
rjrudin Dec 6, 2015
fc450c3
Added buildFromSystemProps to ManageConfig
rjrudin Dec 7, 2015
e690499
#69 Added test to confirm that setting modulesDatabaseName should work
rjrudin Dec 9, 2015
5ac6df1
Merge branch 'dev'
rjrudin Dec 9, 2015
3f84af1
Added methods for enabling/disabling flexrep targets
rjrudin Dec 9, 2015
f1c5a31
Merge branch 'master' into dev
rjrudin Dec 9, 2015
8ea4f9b
More disable/enable methods for TargetManager
rjrudin Dec 9, 2015
c5ee867
Removing OBE command
rjrudin Dec 10, 2015
5688475
Added property to LoadModulesCommand for specifying more binary exten…
rjrudin Dec 10, 2015
522b72a
Added disableAll/enableAll to ConfigManager
rjrudin Dec 10, 2015
1f4f30f
Allowing for DocumentFormatGetter to be overridden
rjrudin Dec 10, 2015
3f60637
Don't need to override this now that group-id is part of the resource…
rjrudin Dec 13, 2015
1561e27
Finish ml-objects
rjrudin Dec 13, 2015
481e299
Finish resource-api
rjrudin Dec 17, 2015
d118c4f
#72 Fixing issue where "is deleted" wasn't saved in the DeleteReceipt…
rjrudin Dec 20, 2015
abde0c6
#72 Updated changelog
rjrudin Dec 20, 2015
697e22b
Reworking how mlModulePermissions is processed
rjrudin Dec 20, 2015
9a99972
Finish api-sandbox
rjrudin Dec 23, 2015
857c4b6
Updated imports
rjrudin Dec 23, 2015
6f85e1d
Repackaged to com.marklogic
rjrudin Dec 23, 2015
92f6d99
Added a limit for # of retries
rjrudin Dec 23, 2015
616e03b
#73 Added support for a FileFilter on AppConfig
rjrudin Dec 27, 2015
8f27bc1
Throwing in a few defaults on AppConfig
rjrudin Dec 29, 2015
21f53d7
Added bintray support
rjrudin Dec 29, 2015
817ee1e
Added sourcesJar
rjrudin Jan 1, 2016
c33061f
Only needs jcenter now
rjrudin Jan 1, 2016
f10db5e
Adding rjrudin bintray back for now
rjrudin Jan 1, 2016
2bcc93d
Only needs jcenter now
rjrudin Jan 3, 2016
6163b7c
Changing logging from warn to info
rjrudin Jan 4, 2016
2936107
Now using 2.5 of ml-javaclient-util and ml-junit
rjrudin Jan 4, 2016
a6809fb
Only need jcenter
rjrudin Jan 5, 2016
3572c4e
#74 New command for verifying server version
rjrudin Jan 6, 2016
8c4a23e
Starting 2.0rc3 changelog
rjrudin Jan 6, 2016
fbc4c6e
#75 Finish mimetypes
rjrudin Jan 17, 2016
605e13e
Updated changelog
rjrudin Jan 17, 2016
9d9a747
#77 Now supports properties starting with "marklogic."
rjrudin Jan 18, 2016
732f71c
#78 Fixed issue with mlContentForestsPerHost not being supported
rjrudin Jan 19, 2016
aa7af90
Update README.md
rjrudin Jan 19, 2016
551ce51
Added test for deleting multiple "other" servers at once, and added e…
rjrudin Jan 20, 2016
f3c2d1b
Updating changelog for 2.0rc4
rjrudin Jan 20, 2016
e1988a2
Updated license
rjrudin Jan 31, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added SetSslFipsEnabledCommand
  • Loading branch information
rjrudin committed Nov 27, 2015
commit 277c836d8a677c729d269350971e8c7b41844871
6 changes: 3 additions & 3 deletions CHANGELOG.mdown
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# ml-app-deployer releases
This changelog is in its infancy, but the plan is to start tracking all changes via issues and then associating them
with releases.

TODO Reconcile this with what's in gradle.properties
## 2.0b13

* Added SetSslFipsEnabledCommand

## 2.0b12

* Added null-check in SimpleAppDeployer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.rjrudin.marklogic.appdeployer.command.admin;

import com.rjrudin.marklogic.appdeployer.command.AbstractCommand;
import com.rjrudin.marklogic.appdeployer.command.CommandContext;

public class SetSslFipsEnabledCommand extends AbstractCommand {

private boolean sslFipsEnabled = false;

public SetSslFipsEnabledCommand(boolean sslFipsEnabled) {
this.sslFipsEnabled = sslFipsEnabled;
}

@Override
public void execute(CommandContext context) {
context.getAdminManager().setSslFipsEnabled(sslFipsEnabled);
}

public boolean isSslFipsEnabled() {
return sslFipsEnabled;
}

public void setSslFipsEnabled(boolean sslFipsEnabled) {
this.sslFipsEnabled = sslFipsEnabled;
}

}
6 changes: 6 additions & 0 deletions src/main/java/com/rjrudin/marklogic/mgmt/ManageClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/
public class ManageClient extends LoggingObject {

private ManageConfig manageConfig;
private RestTemplate restTemplate;
private RestTemplate adminRestTemplate;
private String baseUrl;
Expand All @@ -39,6 +40,7 @@ public ManageClient(ManageConfig config) {
}

public void initialize(ManageConfig config) {
this.manageConfig = config;
if (logger.isInfoEnabled()) {
logger.info("Initializing ManageClient with manage config of: " + config);
}
Expand Down Expand Up @@ -170,4 +172,8 @@ public String getBaseUrl() {
public RestTemplate getAdminRestTemplate() {
return adminRestTemplate;
}

public ManageConfig getManageConfig() {
return manageConfig;
}
}
38 changes: 38 additions & 0 deletions src/main/java/com/rjrudin/marklogic/mgmt/admin/AdminManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;

Expand Down Expand Up @@ -140,6 +142,9 @@ public void waitForRestart() {
try {
Thread.sleep(waitForRestartCheckInterval);
getLastRestartTimestamp();
if (logger.isInfoEnabled()) {
logger.info("Finished waiting for MarkLogic to restart");
}
} catch (Exception ex) {
logger.info("Waiting for MarkLogic to restart...");
if (logger.isDebugEnabled()) {
Expand All @@ -149,6 +154,39 @@ public void waitForRestart() {
}
}

/**
* Set whether SSL FIPS is enabled on the cluster or not by running against /v1/eval on 8000.
*/
public void setSslFipsEnabled(final boolean enabled) {
final String xquery = "import module namespace admin = 'http://marklogic.com/xdmp/admin' at '/MarkLogic/admin.xqy'; "
+ "admin:save-configuration(admin:cluster-set-ssl-fips-enabled(admin:get-configuration(), "
+ enabled
+ "()))";

invokeActionRequiringRestart(new ActionRequiringRestart() {
@Override
public boolean execute() {
RestTemplate rt = RestTemplateUtil.newRestTemplate(adminConfig.getHost(), 8000,
adminConfig.getUsername(), adminConfig.getPassword());
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
map.add("xquery", xquery);
HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<MultiValueMap<String, String>>(map,
headers);
String url = format("http://%s:8000/v1/eval", adminConfig.getHost());
if (logger.isInfoEnabled()) {
logger.info("Setting SSL FIPS enabled: " + enabled);
}
rt.exchange(url, HttpMethod.POST, entity, String.class);
if (logger.isInfoEnabled()) {
logger.info("Finished setting SSL FIPS enabled: " + enabled);
}
return true;
}
});
}

public void setWaitForRestartCheckInterval(int waitForRestartCheckInterval) {
this.waitForRestartCheckInterval = waitForRestartCheckInterval;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.rjrudin.marklogic.appdeployer.command.admin;

import com.rjrudin.marklogic.appdeployer.AppConfig;
import com.rjrudin.marklogic.appdeployer.command.CommandContext;
import com.rjrudin.marklogic.mgmt.ManageClient;
import com.rjrudin.marklogic.mgmt.ManageConfig;
import com.rjrudin.marklogic.mgmt.admin.AdminConfig;
import com.rjrudin.marklogic.mgmt.admin.AdminManager;

/**
* TODO Convert this into a real test, adding a isSslFipsEnabled method to AdminManager.
*/
public class SetSslFipsEnabledDebug {

public static void main(String[] args) {
ManageConfig config = new ManageConfig("localhost", 8002, "admin", "admin");
ManageClient manageClient = new ManageClient(config);
AppConfig appConfig = new AppConfig();
AdminManager adminManager = new AdminManager(new AdminConfig("localhost", "admin"));
CommandContext context = new CommandContext(appConfig, manageClient, adminManager);

SetSslFipsEnabledCommand command = new SetSslFipsEnabledCommand(false);
command.execute(context);
}
}