Always include home-mount-script in ad module; add support for fetching homedir-server directly from AD

2 files changed, 1 insertions, 124 deletions

diff --git a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java
index 69ed2b6..d548b9f 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/CreateAdConfig.java
@@ -160,8 +160,7 @@ public class CreateAdConfig extends AbstractTask
 				}
 			}
 			// Home if present
-			if ( this.home.length() != 0
-					&& !Archive.tarAddFile( outArchive, "/opt/openslx/scripts/pam_script_mount_persistent", new File( "./data/ad/mountscript" ), 0644 ) ) {
+			if ( !Archive.tarAddFile( outArchive, "/opt/openslx/scripts/pam_script_mount_persistent", new File( "./data/ad/mountscript" ), 0644 ) ) {
 				status.error = "Could not add mount script to module";
 				return false;
 			}
diff --git a/src/main/java/org/openslx/taskmanager/tasks/SyncdaemonLauncher.java b/src/main/java/org/openslx/taskmanager/tasks/SyncdaemonLauncher.java
deleted file mode 100644
index 98d512a..0000000
--- a/src/main/java/org/openslx/taskmanager/tasks/SyncdaemonLauncher.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.openslx.taskmanager.tasks;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.openslx.taskmanager.api.SystemCommandTask;
-
-import com.google.gson.annotations.Expose;
-
-public class SyncdaemonLauncher extends SystemCommandTask
-{
-	/**
-	 * What to do: start, stop, checkconfig, import, ...
-	 */
-	@Expose
-	private String operation;
-	/**
-	 * When importing, these are the fields for our identity
-	 */
-	@Expose
-	private String importModulus, importPrivateExponent, importPublicExponent, importOrganization;
-	/**
-	 * (IP) Address of this satellite server, used when calling submitkey or updateaddress
-	 */
-	@Expose
-	private String address;
-
-	private StatusObject status = new StatusObject();
-
-	@Override
-	protected String[] initCommandLine()
-	{
-		List<String> params = new ArrayList<>();
-		params.addAll(
-				Arrays.asList(
-						"/usr/bin/sudo",
-						"-n",
-						"-u", "syncdaemon",
-						"/opt/syncdaemon/control.sh" ) );
-		switch ( operation ) {
-		case "start":
-		case "stop":
-		case "checkconfig":
-			params.add( operation );
-			break;
-		case "genid":
-			if ( errorIfNull( importOrganization, "genid: no organization given" ) )
-				return null;
-			params.add( operation );
-			params.add( importOrganization );
-			break;
-		case "updateaddress":
-		case "submitkey":
-			if ( errorIfNull( address, "updateaddress/submitkey: no address given" ) )
-				return null;
-			params.add( operation );
-			params.add( address );
-			break;
-		case "import":
-			if ( errorIfNull( importOrganization, "import: no organization given" )
-					|| errorIfNull( importModulus, "import: no modulus given" )
-					|| errorIfNull( importPrivateExponent, "import: no private exponent given" )
-					|| errorIfNull( importPublicExponent, "import: no public exponent given" ) )
-				return null;
-			params.add( operation );
-			params.add( importOrganization );
-			params.add( importModulus );
-			params.add( importPrivateExponent );
-			params.add( importPublicExponent );
-			break;
-		default:
-			status.addMsg( "Unknown operation: " + operation );
-			return null;
-		}
-		this.timeoutSeconds = 5;
-		return params.toArray( new String[ 0 ] );
-	}
-
-	private boolean errorIfNull( String check, String message )
-	{
-		if ( check == null )
-			status.addMsg( message );
-		return check == null;
-	}
-
-	@Override
-	protected boolean processEnded( int exitCode )
-	{
-		return exitCode == 0;
-	}
-
-	@Override
-	protected void processStdOut( String line )
-	{
-		status.addMsg( line );
-	}
-
-	@Override
-	protected void processStdErr( String line )
-	{
-		status.addMsg( line );
-	}
-
-	@Override
-	protected boolean initTask()
-	{
-		this.setStatusObject( this.status );
-		return !errorIfNull( operation, "No operation given" );
-	}
-
-	class StatusObject
-	{
-		private String messages = "";
-
-		public void addMsg( String str )
-		{
-			messages = messages + "\n" + str;
-		}
-	}
-
-}