diff options
| author | Simon Rettberg | 2015-05-04 19:12:39 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-05-04 19:12:39 +0200 |
| commit | 4487a9dad97f8f004303eb74c48278fbb90e7a44 (patch) | |
| tree | af2f4a9a37a0060fbf9aab845104433d0d0caf9c /src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java | |
| parent | Add PortScan task (diff) | |
| download | tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.tar.gz tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.tar.xz tmlite-bwlp-4487a9dad97f8f004303eb74c48278fbb90e7a44.zip | |
Update CreateAdConfig to match new ldadp config format
Diffstat (limited to 'src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java')
| -rw-r--r-- | src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java index 6324657..2250d84 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java +++ b/src/main/java/org/openslx/taskmanager/tasks/LighttpdHttps.java @@ -46,7 +46,7 @@ public class LighttpdHttps extends AbstractTask private boolean createRandom() { - int ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--random", this.proxyip ); + int ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--random", this.proxyip ); if ( ret != 0 ) { status.error = "generator exited with code " + ret; return false; @@ -75,16 +75,16 @@ public class LighttpdHttps extends AbstractTask return false; } int ret; - ret = Exec.sync( "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 5, "/opt/taskmanager/scripts/install-https", "--test", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); if ( ret != 0 ) { status.error = "Given key and certificate do not match, or have invalid format (exit code: " + ret + ")"; return false; } if ( tmpChain != null ) { - ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), + ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath(), tmpChain.getAbsolutePath() ); } else { - ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); + ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--import", tmpKey.getAbsolutePath(), tmpCert.getAbsolutePath() ); } if ( ret != 0 ) { status.error = "import exited with code " + ret; @@ -101,7 +101,7 @@ public class LighttpdHttps extends AbstractTask private boolean disableHttps() { - int ret = Exec.sync( "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); + int ret = Exec.sync( 5, "sudo", "-n", "-u", "root", "/opt/taskmanager/scripts/install-https", "--disable" ); if ( ret != 0 ) { status.error = "disable exited with code " + ret; return false; |