1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
index c3fb21c..0f28c39 100644
--- a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
+++ b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java
@@ -124,13 +124,14 @@ public class ThriftConnection
 				log.debug( "The client was null" );
 			}
 			try {
-				toEncrypt = theClient.startServerAuthentication( "michis-test.de" );
+				toEncrypt = theClient.startServerAuthentication( Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME) );
 				log.info( "The random String we want to encrypt: " + toEncrypt );
-				EncryptWithServerIdPublicKey rse = new EncryptWithServerIdPublicKey( "serverid", "password",
-						"/home/michael/satellite-daemon/config/serverid.jks" );
+				EncryptWithServerIdPublicKey rse = new EncryptWithServerIdPublicKey( Globals.getPropertyString( PropString.RNDSTRINGENCRYPTALIAS ),
+						Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPASSWORD ),
+						Globals.getPropertyString( PropString.RNDSTRINGENCRYPTPATH ) );
 				byte[] byteArray = rse.encryptString( toEncrypt );
 				sSD = theClient.serverAuthenticate(
-						"michis-test.de", ByteBuffer.wrap( byteArray ) );
+						Globals.getPropertyString( PropString.THRIFTORGANIZATIONNAME), ByteBuffer.wrap( byteArray ) );
 			} catch ( ServerAuthenticationException e ) {
 				log.error( "ThriftConnection: Server Authetication was not sucessful." );
 				e.printStackTrace();