Stuff

1 files changed, 7 insertions, 3 deletions

diff --git a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java
index e3a06bf..6324657 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java
@@ -8,6 +8,10 @@ import org.openslx.taskmanager.api.AbstractTask;
 
 import com.google.gson.annotations.Expose;
 
+/**
+ * Task for enabling or disabling https support in lighttpd.
+ * Can greate a self-signed cert on the fly, or use a supplied one.
+ */
 public class LighttpdHttps extends AbstractTask
 {
 
@@ -33,9 +37,9 @@ public class LighttpdHttps extends AbstractTask
 	@Override
 	protected boolean execute()
 	{
-		if ( this.importcert != null && this.importkey != null )
+		if ( this.importcert != null && this.importkey != null && !this.importcert.isEmpty() && !this.importkey.isEmpty() )
 			return createFromInput();
-		if ( this.proxyip != null )
+		if ( this.proxyip != null && !this.proxyip.isEmpty() )
 			return createRandom();
 		return disableHttps();
 	}
@@ -99,7 +103,7 @@ public class LighttpdHttps extends AbstractTask
 	{
 		int ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" );
 		if ( ret != 0 ) {
-			status.error = "import exited with code " + ret;
+			status.error = "disable exited with code " + ret;
 			return false;
 		}
 		return true;