X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FFirstInit.java;h=1c7cb149752a7c30ce6b56da3ad1f9db8da21929;hb=5b5c2b97eee9edd037e198acadf8b416a973863f;hp=78eb68289647de357e15ac70c8a1df8aeef0696e;hpb=3200c28bdc2f274178a62a372dbd2f2cd12855ed;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
index 78eb68289..1c7cb1497 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java
@@ -75,7 +75,7 @@ class FirstInit {
 				if (keyStorePassword == null)
 					keyStorePassword = "changeit";
 				if (!Files.exists(keyStorePath))
-					createSelfSignedKeyStore(keyStorePath);
+					createSelfSignedKeyStore(keyStorePath, keyStorePassword);
 				props.put(JettyConstants.SSL_KEYSTORETYPE, "PKCS12");
 				props.put(JettyConstants.SSL_KEYSTORE, keyStorePath.toString());
 				props.put(JettyConstants.SSL_PASSWORD, keyStorePassword);
@@ -115,18 +115,18 @@ class FirstInit {
 		// Business roles
 		String userAdminUris = getFrameworkProp(NodeConstants.USERADMIN_URIS);
 		if (userAdminUris == null) {
-				String demoBaseDn = "dc=example,dc=com";
-				File businessRolesFile = new File(nodeBaseDir, demoBaseDn + ".ldif");
-				if (!businessRolesFile.exists())
-					try {
-						FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(demoBaseDn + ".ldif"),
-								businessRolesFile);
-					} catch (IOException e) {
-						throw new CmsException("Cannot copy demo resource", e);
-					}
-				userAdminUris = businessRolesFile.toURI().toString();
-				log.warn("## DEV Using dummy base DN " + demoBaseDn);
-				// TODO downgrade security level
+			String demoBaseDn = "dc=example,dc=com";
+			File businessRolesFile = new File(nodeBaseDir, demoBaseDn + ".ldif");
+			if (!businessRolesFile.exists())
+				try {
+					FileUtils.copyInputStreamToFile(getClass().getResourceAsStream(demoBaseDn + ".ldif"),
+							businessRolesFile);
+				} catch (IOException e) {
+					throw new CmsException("Cannot copy demo resource", e);
+				}
+			userAdminUris = businessRolesFile.toURI().toString();
+			log.warn("## DEV Using dummy base DN " + demoBaseDn);
+			// TODO downgrade security level
 		}
 		for (String userAdminUri : userAdminUris.split(" "))
 			uris.add(userAdminUri);
@@ -158,10 +158,10 @@ class FirstInit {
 
 		return res;
 	}
-	
+
 	/**
-	 * Called before node initialisation, in order populate OSGi instance are
-	 * with some files (typically LDIF, etc).
+	 * Called before node initialisation, in order populate OSGi instance are with
+	 * some files (typically LDIF, etc).
 	 */
 	static void prepareInstanceArea() {
 		String nodeInit = getFrameworkProp(NodeConstants.NODE_INIT);
@@ -196,11 +196,11 @@ class FirstInit {
 			}
 	}
 
-	private void createSelfSignedKeyStore(Path keyStorePath) {
+	private void createSelfSignedKeyStore(Path keyStorePath, String keyStorePassword) {
 		// for (Provider provider : Security.getProviders())
 		// System.out.println(provider.getName());
 		File keyStoreFile = keyStorePath.toFile();
-		char[] ksPwd = "changeit".toCharArray();
+		char[] ksPwd = keyStorePassword.toCharArray();
 		char[] keyPwd = Arrays.copyOf(ksPwd, ksPwd.length);
 		if (!keyStoreFile.exists()) {
 			try {